phpMv / phpMv-UI

Ajax/common/html/BaseHtml.php

Doc Comments +14 added lines

@@ -71,6 +71,10 @@ 
 
 
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
 			return $name=$value;
@@ -88,6 +92,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)) {
@@ -98,6 +106,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function addToMember(&$name, $value, $separator=" ") {
 		$name=str_ireplace($value, "", $name) . $separator . $value;
 		return $this;
@@ -179,6 +190,9 @@ 
 		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
 	}
 
+	/**
+	 * @param \Closure $callback
+	 */
 	protected function _getElementBy($callback,$elements){
 		if (\is_array($elements)) {
 			$flag=false;

Spacing +30 added lines, -30 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.2
  */
 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;
 
 	public function getBsComponent() {
@@ -32,24 +32,24 @@ 
 	}
 
 	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 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);
 			}
 		}
@@ -58,12 +58,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;
@@ -72,7 +72,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;
@@ -81,7 +81,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -89,17 +89,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;
 	}
 
@@ -127,26 +127,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;
 			}
 		}
@@ -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,20 +176,20 @@ 
 
 
 	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);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $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=($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;

Braces +12 added lines, -8 removed lines

@@ -128,8 +128,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){
@@ -184,15 +185,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;
 	}

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;
 	}