phpMv / phpMv-UI

Ajax/semantic/widgets/dataform/FormFieldAsTrait.php

Doc Comments +10 added lines

@@ -16,7 +16,14 @@ 
 
 trait FormFieldAsTrait{
 
+	/**
+	 * @param string $prefix
+	 */
 	abstract protected function _getFieldIdentifier($prefix);
+
+	/**
+	 * @param \Closure $callback
+	 */
 	abstract public function setValueFunction($index,$callback);
 
 	private function _getLabelField($caption,$icon=NULL){
@@ -47,6 +54,9 @@ 
 		$element->fromArray($attributes);
 	}
 
+	/**
+	 * @param \Closure $elementCallback
+	 */
 	protected function _fieldAs($elementCallback,$index,$attributes=NULL){
 		$this->setValueFunction($index,function($value)use ($index,&$attributes,$elementCallback){
 			$caption=$this->_instanceViewer->getCaption($index);

Spacing +35 added lines, -35 removed lines

@@ -14,13 +14,13 @@ 
  * @property object $_modelInstance;
  */
 
-trait FormFieldAsTrait{
+trait FormFieldAsTrait {
 
 	abstract protected function _getFieldIdentifier($prefix);
-	abstract public function setValueFunction($index,$callback);
+	abstract public function setValueFunction($index, $callback);
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
@@ -28,65 +28,65 @@ 
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["rules"])){
+	protected function _applyAttributes($element, &$attributes, $index) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules))
+			if (\is_array($rules))
 				$element->addRules($rules);
 			else
 				$element->addRule($rules);
 			unset($attributes["rules"]);
 		}
-		if(isset($attributes["callback"])){
+		if (isset($attributes["callback"])) {
 			$callback=$attributes["callback"];
-			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+			if (\is_callable($callback)) {
+				$callback($element, $this->_modelInstance, $index);
 				unset($attributes["callback"]);
 			}
 		}
 		$element->fromArray($attributes);
 	}
 
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL){
-		$this->setValueFunction($index,function($value)use ($index,&$attributes,$elementCallback){
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL) {
+		$this->setValueFunction($index, function($value)use ($index, &$attributes, $elementCallback){
 			$caption=$this->_instanceViewer->getCaption($index);
 			$name=$this->_instanceViewer->getFieldName($index);
-			$element=$elementCallback($name,$caption,$value);
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			$element=$elementCallback($name, $caption, $value);
+			if (\is_array($attributes))
+				$this->_applyAttributes($element, $attributes, $index);
 			return $element;
 		});
 			return $this;
 	}
 
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($name,$caption,$value){
-			return new HtmlFormRadio($name,$name,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($name, $caption, $value) {
+			return new HtmlFormRadio($name, $name, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($name,$caption,$value){
-			return new HtmlFormTextarea($name,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($name, $caption, $value) {
+			return new HtmlFormTextarea($name, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($name,$caption,$value){
-			return new HtmlFormInput($name,$caption,"text",$value);
-		}, $index,$attributes);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($name, $caption, $value) {
+			return new HtmlFormInput($name, $caption, "text", $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($name,$caption,$value){
-			return new HtmlFormCheckbox($name,$caption,$value);
-		}, $index,$attributes);
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($name, $caption, $value) {
+			return new HtmlFormCheckbox($name, $caption, $value);
+		}, $index, $attributes);
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($name,$caption,$value) use ($elements,$multiple){
-			return new HtmlFormDropdown($name,$elements,$caption,$value,$multiple);
-		}, $index,$attributes);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($name, $caption, $value) use ($elements, $multiple){
+			return new HtmlFormDropdown($name, $elements, $caption, $value, $multiple);
+		}, $index, $attributes);
 	}
 }
\ No newline at end of file

Braces +8 added lines, -6 removed lines

@@ -31,10 +31,11 @@ 
 	protected function _applyAttributes($element,&$attributes,$index){
 		if(isset($attributes["rules"])){
 			$rules=$attributes["rules"];
-			if(\is_array($rules))
-				$element->addRules($rules);
-			else
-				$element->addRule($rules);
+			if(\is_array($rules)) {
+							$element->addRules($rules);
+			} else {
+							$element->addRule($rules);
+			}
 			unset($attributes["rules"]);
 		}
 		if(isset($attributes["callback"])){
@@ -52,8 +53,9 @@ 
 			$caption=$this->_instanceViewer->getCaption($index);
 			$name=$this->_instanceViewer->getFieldName($index);
 			$element=$elementCallback($name,$caption,$value);
-			if(\is_array($attributes))
-				$this->_applyAttributes($element, $attributes,$index);
+			if(\is_array($attributes)) {
+							$this->_applyAttributes($element, $attributes,$index);
+			}
 			return $element;
 		});
 			return $this;

Ajax/common/Widget.php

Spacing +25 added lines, -25 removed lines

@@ -30,21 +30,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;
 	}
 
@@ -68,42 +68,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;
 	}
@@ -111,8 +111,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();
 		}
@@ -125,30 +125,30 @@ 
 	 * @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){
+	public function addItemInToolbar($caption, $icon=NULL) {
 		$result=$this->addInToolbar($caption);
 		$result->addIcon($icon);
 		return $result;
 	}
 
-	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 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);
 	}
 }
\ No newline at end of file

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

Spacing +32 added lines, -32 removed lines

@@ -12,34 +12,34 @@ 
 class HtmlFormField extends HtmlSemDoubleElement {
 	protected $_container;
 	protected $_validation;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label)===true)
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label)===true)
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label,$pointing=Direction::NONE){
-		$labelO=new HtmlLabel("",$label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -47,8 +47,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -56,7 +56,7 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
@@ -64,14 +64,14 @@ 
 	 * Return the field with data
 	 * @return mixed
 	 */
-	public function getDataField(){
+	public function getDataField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -82,31 +82,31 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function setInline(){
+	public function setInline() {
 		return $this->addToProperty("class", "inline");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {
@@ -114,23 +114,23 @@ 
 		return $this;
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			$this->_validation->addRule($type,$prompt,$value);
+			$this->_validation->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addRules(array $rules){
-		foreach ($rules as $rule){
+	public function addRules(array $rules) {
+		foreach ($rules as $rule) {
 			$this->addRule($rule);
 		}
 		return $this;

Braces +6 added lines, -4 removed lines

@@ -16,8 +16,9 @@ 
 		parent::__construct($identifier, "div","field");
 		$this->content=array();
 		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label)===true)
-			$this->setLabel($label);
+		if(isset($label)===true) {
+					$this->setLabel($label);
+		}
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
@@ -48,8 +49,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if(\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**

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

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 		}
 		if (isset($label))
 			$this->setLabel($label);
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$this->addItem($field);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if($item instanceof HtmlFormField)
+		if ($item instanceof HtmlFormField)
 			$item->setContainer($this);
 		return $item;
 	}
@@ -98,9 +98,9 @@ 
 
 
 	public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
 			if ($val===$value) {
 				$itemO->getField()->setProperty("checked", "");
@@ -114,9 +114,9 @@ 
 	}
 
 	public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
 			if (\array_search($val, $values)!==false) {
 				$itemO->getField()->getField()->setProperty("checked", "");

Braces +18 added lines, -12 removed lines

@@ -29,12 +29,14 @@ 
 				if (\is_string($end)) {
 					$label=$end;
 					\array_pop($fields);
-				} else
-					$label=NULL;
+				} else {
+									$label=NULL;
+				}
 			}
 		}
-		if (isset($label))
-			$this->setLabel($label);
+		if (isset($label)) {
+					$this->setLabel($label);
+		}
 		foreach ( $fields as $field ) {
 			$this->addItem($field);
 		}
@@ -57,8 +59,9 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if($item instanceof HtmlFormField)
-			$item->setContainer($this);
+		if($item instanceof HtmlFormField) {
+					$item->setContainer($this);
+		}
 		return $item;
 	}
 
@@ -66,8 +69,9 @@ 
 		if ($this->_equalWidth) {
 			$count=$this->count();
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
-		} else
-			$this->addToProperty("class", "fields");
+		} else {
+					$this->addToProperty("class", "fields");
+		}
 		return parent::compile($js, $view);
 	}
 
@@ -108,8 +112,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields("fields-".$name, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 
@@ -124,8 +129,9 @@ 
 			$fields[]=$itemO;
 		}
 		$radios=new HtmlFormFields("fields-".$name, $fields);
-		if (isset($label))
-			$radios->setLabel($label)->setProperty("for", $name);
+		if (isset($label)) {
+					$radios->setLabel($label)->setProperty("for", $name);
+		}
 		return $radios;
 	}
 

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +13 added lines, -13 removed lines

@@ -18,43 +18,43 @@ 
 	use FormFieldAsTrait;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_instanceViewer=new FormInstanceViewer();
 		$this->content=["form"=>new HtmlForm($identifier)];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->_instanceViewer->setInstance($this->_modelInstance);
 
 		$form=$this->content["form"];
 		$this->_generateContent($form);
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($form);
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$separators[]=$count;
-		for($i=0;$i<\sizeof($separators)-1;$i++){
-			$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
-			if(\sizeof($fields)===1){
+		for ($i=0; $i<\sizeof($separators)-1; $i++) {
+			$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
+			if (\sizeof($fields)===1) {
 				$form->addField($fields[0]);
-			}else
+			} else
 				$form->addFields($fields);
 		}
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
 	}
@@ -84,7 +84,7 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function setValidationParams(array $_validationParams){
+	public function setValidationParams(array $_validationParams) {
 		return $this->getHtmlComponent()->setValidationParams($_validationParams);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -49,8 +49,9 @@
 			$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
 			if(\sizeof($fields)===1){
 				$form->addField($fields[0]);
-			}else
-				$form->addFields($fields);
+			} else {
+							$form->addFields($fields);
+			}
 		}
 	}
 

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

Spacing +11 added lines, -11 removed lines

@@ -14,36 +14,36 @@
 		$this->separators=[-1];
 	}
 
-	protected function _beforeAddProperty($index,&$field){
-		if(JString::endswith($field, "\n")===true){
+	protected function _beforeAddProperty($index, &$field) {
+		if (JString::endswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index);
 		}
-		if($index>1 && JString::startswith($field, "\n")===true){
+		if ($index>1 && JString::startswith($field, "\n")===true) {
 			$this->addSeparatorAfter($index-1);
 		}
 		$field=\str_replace("\n", "", $field);
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$caption=$this->getCaption($index);
-		$input=new HtmlFormInput($name,$caption,"text",$value);
+		$input=new HtmlFormInput($name, $caption, "text", $value);
 		return $input;
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=\strtolower($this->getCaption($index));
 		}
 		return $result;
 	}
 
-	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
+	public function addSeparatorAfter($fieldNum) {
+		if (\array_search($fieldNum, $this->separators)===false)
 			$this->separators[]=$fieldNum;
 			return $this;
 	}

Braces +5 added lines, -4 removed lines

@@ -34,17 +34,18 @@
 		$property=$this->getProperty($index);
 		if($property instanceof \ReflectionProperty){
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		} elseif(\is_callable($property)){
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else{
 			$result=\strtolower($this->getCaption($index));
 		}
 		return $result;
 	}
 
 	public function addSeparatorAfter($fieldNum){
-		if(\array_search($fieldNum, $this->separators)===false)
-			$this->separators[]=$fieldNum;
+		if(\array_search($fieldNum, $this->separators)===false) {
+					$this->separators[]=$fieldNum;
+		}
 			return $this;
 	}
 

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +63 added lines, -63 removed lines

@@ -14,139 +14,139 @@ 
 
 	public static $index=0;
 
-	public function __construct($instance=NULL,$captions=NULL){
+	public function __construct($instance=NULL, $captions=NULL) {
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier(){
+	public function getIdentifier() {
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if (isset($this->values["identifier"]))
+			$value=$this->values["identifier"](self::$index, $this->instance);
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		return $value;
 	}
 
-	protected function _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	protected function _getValue($property, $index) {
+		if ($property instanceof \ReflectionProperty) {
 			$property->setAccessible(true);
 			$value=$property->getValue($this->instance);
-			if(isset($this->values[$index])){
-				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value, $this->instance, $index);
+			} else {
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
 			}
-		}else{
-			if(\is_callable($property))
+		} else {
+			if (\is_callable($property))
 				$value=$property($this->instance);
-			elseif(\is_array($property)){
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+			elseif (\is_array($property)) {
+				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 				$value=\implode("", $values);
-			}else
+			} else
 				$value=$property;
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, $index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (\is_array($vb[$index])) {
 				$this->visibleProperties[$index][]=$field;
-			}else{
-				$this->visibleProperties[$index]=[$vb[$index],$field];
+			} else {
+				$this->visibleProperties[$index]=[$vb[$index], $field];
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
-				if(\is_callable($property)){
+		} else {
+			foreach ($this->visibleProperties as $property) {
+				if (\is_callable($property)) {
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
-					try{
+				}elseif (\is_string($property)) {
+					try {
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					}catch (\Exception $e) {
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$this->properties[]=$property;
 					}
-				}elseif(\is_int($property)){
+				}elseif (\is_int($property)) {
 					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
+					if (isset($props[$property]))
 						$this->properties[]=$props[$property];
 					else
 						$this->properties[]=$property;
-				}else{
+				} else {
 					$this->properties[]=$property;
 				}
 			}
@@ -154,12 +154,12 @@ 
 		return $this;
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -171,12 +171,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -189,19 +189,19 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
+	public function getCaption($index) {
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-			elseif(\is_callable($this->properties[$index]))
+			elseif (\is_callable($this->properties[$index]))
 			return "";
 			else
 				return $this->properties[$index];
 	}
 
-	public function getCaptions(){
-		if(isset($this->captions)){
-			$result= $this->captions;
-			for($i=\sizeof($result);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$result=$this->captions;
+			for ($i=\sizeof($result); $i<$this->count(); $i++) {
 				$result[]="";
 			}
 			return $result;
@@ -209,7 +209,7 @@ 
 		$captions=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$captions[]=$this->getCaption($index++);
 		}
 		return $captions;
@@ -227,7 +227,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Braces +33 added lines, -28 removed lines

@@ -17,8 +17,9 @@ 
 	public function __construct($instance=NULL,$captions=NULL){
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 	}
 
@@ -34,8 +35,9 @@ 
 
 	public function getIdentifier(){
 		$value=self::$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"](self::$index,$this->instance);
+		if(isset($this->values["identifier"])) {
+					$value=$this->values["identifier"](self::$index,$this->instance);
+		}
 		return $value;
 	}
 
@@ -58,17 +60,18 @@ 
 			$value=$property->getValue($this->instance);
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value,$this->instance,$index);
-			}else{
+			} else{
 				$value=$this->_getDefaultValue($property->getName(),$value, $index);
 			}
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($property)){
+		} else{
+			if(\is_callable($property)) {
+							$value=$property($this->instance);
+			} elseif(\is_array($property)){
 				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 				$value=\implode("", $values);
-			}else
-				$value=$property;
+			} else {
+							$value=$property;
+			}
 		}
 		if(isset($this->afterCompile[$index])){
 			if(\is_callable($this->afterCompile[$index])){
@@ -88,10 +91,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -127,26 +130,27 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				if(\is_callable($property)){
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
+				} elseif(\is_string($property)){
 					try{
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					} catch(\Exception $e){
 						$this->_beforeAddProperty(\sizeof($this->properties), $property);
 						$this->properties[]=$property;
 					}
-				}elseif(\is_int($property)){
+				} elseif(\is_int($property)){
 					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
-						$this->properties[]=$props[$property];
-					else
-						$this->properties[]=$property;
-				}else{
+					if(isset($props[$property])) {
+											$this->properties[]=$props[$property];
+					} else {
+											$this->properties[]=$property;
+					}
+				} else{
 					$this->properties[]=$property;
 				}
 			}
@@ -190,12 +194,13 @@ 
 	}
 
 	public function getCaption($index){
-		if($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-			elseif(\is_callable($this->properties[$index]))
-			return "";
-			else
-				return $this->properties[$index];
+		if($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif(\is_callable($this->properties[$index])) {
+						return "";
+			} else {
+							return $this->properties[$index];
+			}
 	}
 
 	public function getCaptions(){

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -24,8 +24,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 }
\ No newline at end of file