phpMv / phpMv-UI

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

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
 use Ajax\semantic\html\collections\HtmlMessage;
 use Ajax\service\AjaxCall;
 
-trait FormTrait{
+trait FormTrait {
 	/**
 	 * @return HtmlForm
 	 */
@@ -15,7 +15,7 @@ 
 		return $this->getForm()->addToProperty("class", "loading");
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -30,35 +30,35 @@ 
 	 * @param string $responseElement
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function submitOn($event,$identifier,$url,$responseElement){
+	public function submitOn($event, $identifier, $url, $responseElement) {
 		$form=$this->getForm();
 		$elem=$form->getElementById($identifier, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement){
+	public function submitOnClick($identifier, $url, $responseElement) {
 		return $this->submitOn("click", $identifier, $url, $responseElement);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
 	}
 
-	protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){
+	protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
+		if (isset($url) && isset($responseElement)) {
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
-			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url]));
+			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url]));
 		}
 		return $button;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -68,7 +68,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -79,7 +79,7 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%");
 		return $form;

Ajax/semantic/html/collections/table/HtmlTable.php

Doc Comments +12 added lines, -5 removed lines

@@ -23,6 +23,10 @@ 
 	private $_footer;
 	private $_afterCompileEvents;
 
+	/**
+	 * @param integer $rowCount
+	 * @param integer $colCount
+	 */
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
 		$this->content=array ();
@@ -112,7 +116,7 @@ 
 	/**
 	 * Retuns the row at $rowIndex
 	 * @param int $rowIndex
-	 * @return \Ajax\semantic\html\content\HtmlTR
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($rowIndex) {
 		return $this->getBody()->getRow($rowIndex);
@@ -154,7 +158,7 @@ 
 	 * Sets values to the col at index $colIndex
 	 * @param int $colIndex
 	 * @param array $values
-	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 * @return HtmlTable
 	 */
 	public function setColValues($colIndex, $values=array()) {
 		$this->getBody()->setColValues($colIndex, $values);
@@ -165,7 +169,7 @@ 
 	 * Sets values to the row at index $rowIndex
 	 * @param int $rowIndex
 	 * @param array $values
-	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 * @return HtmlTable
 	 */
 	public function setRowValues($rowIndex, $values=array()) {
 		$this->getBody()->setRowValues($rowIndex, $values);
@@ -188,6 +192,9 @@ 
 		return $this->colAlign($colIndex, "colLeft");
 	}
 
+	/**
+	 * @param string $function
+	 */
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
 			foreach ( $colIndex as $cIndex ) {
@@ -263,7 +270,7 @@ 
 
 	/**
 	 * @param array $parts
-	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 * @return HtmlTable
 	 */
 	public function setCompileParts($parts=["tbody"]) {
 		$this->_compileParts=$parts;
@@ -286,7 +293,7 @@ 
 	 * The callback function called after the insertion of each row when fromDatabaseObjects is called
 	 * callback function takes the parameters $row : the row inserted and $object: the instance of model used
 	 * @param callable $callback
-	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 * @return HtmlTable
 	 */
 	public function onNewRow($callback) {
 		$this->_afterCompileEvents["onNewRow"]=$callback;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\JsUtils;
 use Ajax\service\JArray;
-
 use Ajax\semantic\html\base\constants\State;
 
 class HtmlProgress extends HtmlSemDoubleElement {

Spacing +19 added lines, -19 removed lines

@@ -25,10 +25,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -46,9 +46,9 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
@@ -85,7 +85,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -229,12 +229,12 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh();
-		}else{
+		} else {
 			if ($this->propertyContains("class", "sortable")) {
-				$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();");
+				$this->addEvent("execute", "$('#".$this->identifier."').tablesort();");
 			}
 		}
 		$this->content=JArray::sortAssociative($this->content, $this->_compileParts);
@@ -250,13 +250,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -270,14 +270,14 @@ 
 		return $this;
 	}
 
-	public function refresh(){
+	public function refresh() {
 		$this->_footer=$this->getFooter();
 		$this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");');
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
-		if(isset($this->_footer))
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		return $result;
 	}

Braces +7 added lines, -5 removed lines

@@ -232,7 +232,7 @@ 
 		if(\sizeof($this->_compileParts)<3){
 			$this->_template="%content%";
 			$this->refresh();
-		}else{
+		} else{
 			if ($this->propertyContains("class", "sortable")) {
 				$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();");
 			}
@@ -255,8 +255,9 @@ 
 			$result= $this->getBody()->_addRow($result);
 		}
 		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+			if(\is_callable($this->_afterCompileEvents["onNewRow"])) {
+							$this->_afterCompileEvents["onNewRow"]($result,$object);
+			}
 		}
 		return $result;
 	}
@@ -277,8 +278,9 @@ 
 
 	public function run(JsUtils $js){
 		$result= parent::run($js);
-		if(isset($this->_footer))
-			$this->_footer->run($js);
+		if(isset($this->_footer)) {
+					$this->_footer->run($js);
+		}
 		return $result;
 	}
 

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

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 namespace Ajax\semantic\html\collections\table\traits;
 
-trait TableTrait{
+trait TableTrait {
 	/**
 	 * @return HtmlTable
 	 */
 	abstract protected function getTable();
 
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->getTable()->addToProperty($property, $value);
 	}
 
@@ -18,8 +18,8 @@ 
 	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 setCollapsing() {

Braces +3 added lines, -2 removed lines

@@ -17,8 +17,9 @@
 
 	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" ));
 	}
 

Ajax/service/JArray.php

Spacing +22 added lines, -22 removed lines

@@ -5,7 +5,7 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 		// return (array_keys($array)!==range(0, count($array)-1));
 	}
 
@@ -14,7 +14,7 @@ 
 			return $array[$key];
 		}
 		$values=array_values($array);
-		if ($pos < sizeof($values))
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
@@ -22,12 +22,12 @@ 
 		$result=NULL;
 		if (array_key_exists($key, $array)) {
 			$result=$array[$key];
-			if ($condition($result) === true)
+			if ($condition($result)===true)
 				return $result;
 		}
 		$values=array_values($array);
-		foreach ( $values as $val ) {
-			if ($condition($val) === true)
+		foreach ($values as $val) {
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
@@ -44,11 +44,11 @@ 
 		$result="";
 		if (\is_array($glue)) {
 			$size=\sizeof($pieces);
-			if ($size > 0) {
-				for($i=0; $i < $size - 1; $i++) {
-					$result.=$pieces[$i] . @$glue[$i];
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result.=$pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
 			$result=\implode($glue, $pieces);
@@ -58,7 +58,7 @@ 
 
 	public static function dimension($array) {
 		if (is_array(reset($array))) {
-			$return=self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
 			$return=1;
 		}
@@ -66,8 +66,8 @@ 
 	}
 
 	public static function sortAssociative($array, $sortedKeys=array()) {
-		$newArray=array ();
-		foreach ( $sortedKeys as $key ) {
+		$newArray=array();
+		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
 				$newArray[$key]=$array[$key];
 			}
@@ -75,27 +75,27 @@ 
 		return $newArray;
 	}
 
-	public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
 		$result=[];
-		if(isset($modelFunction)===false){
+		if (isset($modelFunction)===false) {
 			$modelFunction="__toString";
 		}
-		if(isset($identifierFunction)===false){
-			foreach ($objects as $object){
+		if (isset($identifierFunction)===false) {
+			foreach ($objects as $object) {
 				$result[]=self::callFunction($object, $modelFunction);
 			}
-		}else{
-			foreach ($objects as $object){
+		} else {
+			foreach ($objects as $object) {
 				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
 		}
 		return $result;
 	}
 
-	private static function callFunction($object,$callback){
-		if(\is_string($callback))
-			return \call_user_func(array($object, $callback),[]);
-		else if (\is_callable($callback)){
+	private static function callFunction($object, $callback) {
+		if (\is_string($callback))
+			return \call_user_func(array($object, $callback), []);
+		else if (\is_callable($callback)) {
 			return $callback($object);
 		}
 	}

Braces +16 added lines, -12 removed lines

@@ -14,21 +14,24 @@ 
 			return $array[$key];
 		}
 		$values=array_values($array);
-		if ($pos < sizeof($values))
-			return $values[$pos];
+		if ($pos < sizeof($values)) {
+					return $values[$pos];
+		}
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
 		$result=NULL;
 		if (array_key_exists($key, $array)) {
 			$result=$array[$key];
-			if ($condition($result) === true)
-				return $result;
+			if ($condition($result) === true) {
+							return $result;
+			}
 		}
 		$values=array_values($array);
 		foreach ( $values as $val ) {
-			if ($condition($val) === true)
-				return $val;
+			if ($condition($val) === true) {
+							return $val;
+			}
 		}
 		return $result;
 	}
@@ -36,8 +39,9 @@ 
 	public static function getDefaultValue($array, $key, $default=NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
-		} else
-			return $default;
+		} else {
+					return $default;
+		}
 	}
 
 	public static function implode($glue, $pieces) {
@@ -84,7 +88,7 @@ 
 			foreach ($objects as $object){
 				$result[]=self::callFunction($object, $modelFunction);
 			}
-		}else{
+		} else{
 			foreach ($objects as $object){
 				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
@@ -93,9 +97,9 @@ 
 	}
 
 	private static function callFunction($object,$callback){
-		if(\is_string($callback))
-			return \call_user_func(array($object, $callback),[]);
-		else if (\is_callable($callback)){
+		if(\is_string($callback)) {
+					return \call_user_func(array($object, $callback),[]);
+		} else if (\is_callable($callback)){
 			return $callback($object);
 		}
 	}

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

Spacing +8 added lines, -8 removed lines

@@ -7,21 +7,21 @@
 
 class HtmlFormDropdown extends HtmlFormField {
 
-	public function __construct($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false,$associative=true) {
-		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label);
+	public function __construct($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false, $associative=true) {
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		return $this->getField()->setItems($items);
 	}
-	public function addItem($item,$value=NULL,$image=NULL){
-		return $this->getField()->addItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		return $this->getField()->addItem($item, $value, $image);
 	}
-	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$associative=true){
-		return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative);
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $associative=true) {
+		return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative);
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->getField()->getInput();
 	}
 }
\ No newline at end of file

Ajax/semantic/html/content/InternalPopup.php

Spacing +17 added lines, -17 removed lines

@@ -14,60 +14,60 @@
 	protected $params;
 	protected $semElement;
 
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
 		$this->semElement=$semElement;
 		$this->title=$title;
 		$this->content=$content;
-		$this->setAttributes($variation,$params);
+		$this->setAttributes($variation, $params);
 	}
 
 	public function setHtml($html) {
-		$this->html= $html;
+		$this->html=$html;
 		return $this;
 	}
 
-	public function setAttributes($variation=NULL,$params=array()){
+	public function setAttributes($variation=NULL, $params=array()) {
 		$this->variation=$variation;
 		$this->params=$params;
 	}
 
-	public function onShow($jsCode){
+	public function onShow($jsCode) {
 		$this->params["onShow"]=$jsCode;
 	}
 
-	public function compile(JsUtils $js=NULL){
-		if(JString::isNotNull($this->title)){
+	public function compile(JsUtils $js=NULL) {
+		if (JString::isNotNull($this->title)) {
 			$this->semElement->addToProperty("data-title", $this->title);
 		}
-		if(JString::isNotNull($this->content)){
+		if (JString::isNotNull($this->content)) {
 			$this->semElement->addToProperty("data-content", $this->content);
 		}
-		if(JString::isNotNull($this->html)){
+		if (JString::isNotNull($this->html)) {
 			$html=$this->html;
-			if(\is_array($html)){
+			if (\is_array($html)) {
 				\array_walk($html, function(&$item) use($js){
-					if($item instanceof HtmlSemDoubleElement){
+					if ($item instanceof HtmlSemDoubleElement) {
 						$comp=$item->compile($js);
-						if(isset($js)){
+						if (isset($js)) {
 							$bs=$item->run($js);
-							if(isset($bs))
+							if (isset($bs))
 								$this->params['onShow']=$bs->getScript();
 						}
 						$item=$comp;
 					}
 				});
-				$html=\implode("",$html);
+				$html=\implode("", $html);
 			}
 			$html=\str_replace("\"", "'", $html);
 			$this->semElement->addToProperty("data-html", $html);
 		}
-		if(JString::isNotNull($this->variation)){
+		if (JString::isNotNull($this->variation)) {
 			$this->semElement->addToProperty("data-variation", $this->variation);
 		}
 	}
 
-	public function run(JsUtils $js){
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
+	public function run(JsUtils $js) {
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
 	}
 
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 						$comp=$item->compile($js);
 						if(isset($js)){
 							$bs=$item->run($js);
-							if(isset($bs))
-								$this->params['onShow']=$bs->getScript();
+							if(isset($bs)) {
+															$this->params['onShow']=$bs->getScript();
+							}
 						}
 						$item=$comp;
 					}

Ajax/common/html/BaseHtml.php

Doc Comments +27 added lines

@@ -124,6 +124,10 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			return $name=$value;
@@ -139,22 +143,35 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function removePropertyValue($name, $value) {
 		$this->properties[$name]=\str_replace($value, "", $this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function removePropertyValues($name, $values) {
 		$this->removeOldValues($this->properties[$name], $values);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function removeProperty($name) {
 		if (\array_key_exists($name, $this->properties))
 			unset($this->properties[$name]);
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			if (is_array($typeCtrl)) {
@@ -165,6 +182,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name) . $separator . $value;
 		return $this;
@@ -179,6 +199,9 @@ 
 		return $this->addToProperty($name, $value);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function addToPropertyCtrl($name, $value, $typeCtrl) {
 		return $this->addToPropertyUnique($name, $value, $typeCtrl);
 	}
@@ -283,6 +306,10 @@ 
 		return null;
 	}
 
+	/**
+	 * @param string $propertyName
+	 * @param string $value
+	 */
 	protected function getElementByPropertyValue($propertyName,$value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;

Spacing +42 added lines, -42 removed lines

@@ -17,9 +17,9 @@ 
 	use BaseHtmlEventsTrait;
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $properties=array();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 
 	public function getBsComponent() {
@@ -32,7 +32,7 @@ 
 	}
 
 	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);
 	}
 
 	public function getProperties() {
@@ -56,13 +56,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;
 
@@ -78,19 +78,19 @@ 
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$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);
 			}
 		}
@@ -99,12 +99,12 @@ 
 
 	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;
@@ -119,13 +119,13 @@ 
 	}
 
 	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 setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -134,7 +134,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -156,17 +156,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;
 	}
 
@@ -184,7 +184,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;
@@ -212,26 +212,26 @@ 
 	}
 
 	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;
 	}
 
-	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;
 			}
 		}
@@ -240,7 +240,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -264,33 +264,33 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+					$flag=($elements[$index]->getIdentifier()===$identifier);
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
+			if ($elements->getIdentifier()===$identifier)
 				return $elements;
 		}
 		return null;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
+			if ($elements->propertyContains($propertyName, $value)===true)
 				return $elements;
 		}
 		return null;

Braces +38 added lines, -26 removed lines

@@ -50,8 +50,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=" ") {
@@ -61,10 +62,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);
 		}
@@ -119,8 +121,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;
 	}
 
@@ -150,8 +153,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;
 	}
 
@@ -171,8 +175,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);
 		}
@@ -213,8 +218,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){
@@ -265,15 +271,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->getIdentifier() === $identifier);
+				}
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
-				return $elements;
+			if ($elements->getIdentifier() === $identifier) {
+							return $elements;
+			}
 		}
 		return null;
 	}
@@ -283,15 +292,18 @@ 
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
-				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				if ($elements[$index] instanceof BaseHtml) {
+									$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+				}
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag === true) {
+							return $elements[$index - 1];
+			}
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
-				return $elements;
+			if ($elements->propertyContains($propertyName, $value) === true) {
+							return $elements;
+			}
 		}
 		return null;
 	}

Ajax/service/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace Ajax\service;
 
 class Javascript {
-	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/Widget.php

Spacing +40 added lines, -40 removed lines

@@ -34,21 +34,21 @@ 
 	protected $_toolbarPosition;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	protected function _getFieldIdentifier($prefix){
+	protected function _getFieldIdentifier($prefix) {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -72,42 +72,42 @@ 
 
 	public abstract function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -115,8 +115,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 			//$this->_toolbar->setSecondary();
 		}
@@ -129,57 +129,57 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
 		return $tb->addItem($element);
 	}
 
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
 
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
 	}
 
-	public function addDropdownInToolbar($value,$items=NULL,$callback=NULL){
+	public function addDropdownInToolbar($value, $items=NULL, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
-	public function addButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton("",$caption);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton("", $caption);
+		return $this->addInToolbar($bt, $callback);
 	}
 
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 

Braces +4 added lines, -3 removed lines

@@ -141,8 +141,9 @@ 
 
 	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
 		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
-			$result->addIcon($icon);
+		if(isset($icon)) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -151,7 +152,7 @@ 
 			foreach ($items as $icon=>$item){
 				$this->addItemInToolbar($item,$icon,$callback);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItemInToolbar($item,null,$callback);
 			}