Completed
Push — master ( 7ff1b8...399f52 )
by Jean-Christophe
03:04
created
Ajax/service/JString.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,33 +2,33 @@
 block discarded – undo
2 2
 namespace Ajax\service;
3 3
 class JString {
4 4
 
5
-	public static function contains($hay,$needle){
6
-		return strpos($hay, $needle) !== false;
5
+	public static function contains($hay, $needle) {
6
+		return strpos($hay, $needle)!==false;
7 7
 	}
8 8
 	public static function startswith($hay, $needle) {
9
-		return substr($hay, 0, strlen($needle)) === $needle;
9
+		return substr($hay, 0, strlen($needle))===$needle;
10 10
 	}
11 11
 
12 12
 	public static function endswith($hay, $needle) {
13
-		return substr($hay, -strlen($needle)) === $needle;
13
+		return substr($hay, -strlen($needle))===$needle;
14 14
 	}
15 15
 
16
-	public static function isNull($s){
16
+	public static function isNull($s) {
17 17
 		return (!isset($s) || NULL===$s || ""===$s);
18 18
 	}
19
-	public static function isNotNull($s){
19
+	public static function isNotNull($s) {
20 20
 		return (isset($s) && NULL!==$s && ""!==$s);
21 21
 	}
22 22
 
23
-	public static function isBoolean($value){
23
+	public static function isBoolean($value) {
24 24
 		return \is_bool($value) || $value==1 || $value==0;
25 25
 	}
26 26
 
27
-	public static function isBooleanTrue($value){
27
+	public static function isBooleanTrue($value) {
28 28
 		return $value==1 || $value;
29 29
 	}
30 30
 
31
-	public static function isBooleanFalse($value){
31
+	public static function isBooleanFalse($value) {
32 32
 		return $value==0 || !$value;
33 33
 	}
34 34
 }
35 35
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/PositionInTable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,5 +3,5 @@
 block discarded – undo
3 3
 use Ajax\common\BaseEnum;
4 4
 
5 5
 abstract class PositionInTable extends BaseEnum {
6
-	const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="thead",FOOTER="tfoot",BODY="tbody";
6
+	const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="thead", FOOTER="tfoot", BODY="tbody";
7 7
 }
8 8
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/traits/SemanticWidgetsTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 	 * @param array $instances
16 16
 	 * @return DataTable
17 17
 	 */
18
-	public function dataTable($identifier,$model, $instances){
19
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
18
+	public function dataTable($identifier, $model, $instances) {
19
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
20 20
 	}
21 21
 
22 22
 	/**
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 	 * @param object $instance
25 25
 	 * @return DataElement
26 26
 	 */
27
-	public function dataElement($identifier, $instance){
28
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
27
+	public function dataElement($identifier, $instance) {
28
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
29 29
 	}
30 30
 
31 31
 	/**
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param object $instance
34 34
 	 * @return DataForm
35 35
 	 */
36
-	public function dataForm($identifier, $instance){
37
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
36
+	public function dataForm($identifier, $instance) {
37
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
38 38
 	}
39 39
 }
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@
 block discarded – undo
8 8
 class HtmlFormInput extends HtmlFormField {
9 9
 	use TextFieldsTrait;
10 10
 
11
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
11
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
12
+		if (!isset($placeholder) && $type==="text")
13 13
 			$placeholder=$label;
14
-		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
14
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
15 15
 	}
16 16
 
17
-	public function getDataField(){
18
-		$field= $this->getField();
17
+	public function getDataField() {
18
+		$field=$this->getField();
19 19
 		//TODO check getField
20
-		if($field instanceof HtmlInput)
20
+		if ($field instanceof HtmlInput)
21 21
 			$field=$field->getDataField();
22 22
 		return $field;
23 23
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,17 +9,17 @@  discard block
 block discarded – undo
9 9
 class HtmlFormTextarea extends HtmlFormField {
10 10
 	use TextFieldsTrait;
11 11
 
12
-	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
12
+	public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) {
13
+		if (!isset($placeholder))
14 14
 			$placeholder=$label;
15
-		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
15
+		parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label);
16 16
 	}
17 17
 
18 18
 	/**
19 19
 	 * Defines the textarea row count
20 20
 	 * @param int $count
21 21
 	 */
22
-	public function setRows($count){
22
+	public function setRows($count) {
23 23
 		$this->getField()->setRows($count);
24 24
 	}
25 25
 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		return $this->content["field"];
28 28
 	}
29 29
 
30
-	public function setName($name){
31
-		$this->getDataField()->setProperty("name",$name);
30
+	public function setName($name) {
31
+		$this->getDataField()->setProperty("name", $name);
32 32
 	}
33 33
 }
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 
7 7
 	abstract public function getDataField();
8 8
 	abstract public function addToProperty($name, $value, $separator=" ");
9
-	public function setPlaceholder($value){
9
+	public function setPlaceholder($value) {
10 10
 		$this->getDataField()->setPlaceholder($value);
11 11
 		return $this;
12 12
 	}
13 13
 
14
-	public function setValue($value){
14
+	public function setValue($value) {
15 15
 		$this->getDataField()->setValue($value);
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function setInputType($type){
20
-		if($type==="hidden")
21
-			$this->addToProperty("style","display:none;");
19
+	public function setInputType($type) {
20
+		if ($type==="hidden")
21
+			$this->addToProperty("style", "display:none;");
22 22
 		$this->getDataField()->setInputType($type);
23 23
 		return $this;
24 24
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlMessage.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -31,38 +31,38 @@  discard block
 block discarded – undo
31 31
 	 * @param string|HtmlSemDoubleElement $header
32 32
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
33 33
 	 */
34
-	public function addHeader($header){
34
+	public function addHeader($header) {
35 35
 		$headerO=$header;
36
-		if(\is_string($header)){
37
-			$headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div");
36
+		if (\is_string($header)) {
37
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
38 38
 			$headerO->setClass("header");
39 39
 			$headerO->setContent($header);
40 40
 		}
41
-		return $this->addContent($headerO,true);
41
+		return $this->addContent($headerO, true);
42 42
 	}
43 43
 
44
-	public function addList($elements,$ordered=false){
45
-		$list=new HtmlList("list-".$this->identifier,$elements);
44
+	public function addList($elements, $ordered=false) {
45
+		$list=new HtmlList("list-".$this->identifier, $elements);
46 46
 		$list->setOrdered($ordered);
47 47
 		$list->setClass("ui list");
48 48
 		$this->addContent($list);
49 49
 	}
50 50
 
51
-	public function setIcon($icon){
51
+	public function setIcon($icon) {
52 52
 		$this->addToProperty("class", "icon");
53
-		$this->wrapContent("<div class='content'>","</div>");
53
+		$this->wrapContent("<div class='content'>", "</div>");
54 54
 		$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
55 55
 		return $this;
56 56
 	}
57 57
 
58
-	public function addLoader($loaderIcon="notched circle"){
58
+	public function addLoader($loaderIcon="notched circle") {
59 59
 		$this->setIcon($loaderIcon);
60 60
 		$this->icon->addToIcon("loading");
61 61
 		return $this;
62 62
 	}
63 63
 
64
-	public function setDismissable($dismiss=true){
65
-		if($dismiss===true)
64
+	public function setDismissable($dismiss=true) {
65
+		if ($dismiss===true)
66 66
 			$this->close=new HtmlIcon("close-".$this->identifier, "close");
67 67
 		else
68 68
 			$this->close=NULL;
@@ -73,34 +73,34 @@  discard block
 block discarded – undo
73 73
 	 * {@inheritDoc}
74 74
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
75 75
 	 */
76
-	public function run(JsUtils $js){
76
+	public function run(JsUtils $js) {
77 77
 		parent::run($js);
78
-		if(isset($this->close)){
78
+		if (isset($this->close)) {
79 79
 			$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')");
80 80
 		}
81 81
 	}
82 82
 
83
-	public function setState($visible=true){
84
-		$visible=($visible===true)?"visible":"hidden";
85
-		return $this->addToPropertyCtrl("class", $visible, array("visible","hidden"));
83
+	public function setState($visible=true) {
84
+		$visible=($visible===true) ? "visible" : "hidden";
85
+		return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden"));
86 86
 	}
87 87
 
88
-	public function setVariation($value="floating"){
89
-		return $this->addToPropertyCtrl("class", $value, array("floating","compact"));
88
+	public function setVariation($value="floating") {
89
+		return $this->addToPropertyCtrl("class", $value, array("floating", "compact"));
90 90
 	}
91 91
 
92
-	public function setStyle($style){
92
+	public function setStyle($style) {
93 93
 		return $this->addToPropertyCtrl("class", $style, Style::getConstants());
94 94
 	}
95 95
 
96
-	public function setError(){
96
+	public function setError() {
97 97
 		return $this->setStyle("error");
98 98
 	}
99 99
 
100
-	public function setMessage($message){
101
-		if(\is_array($this->content)){
100
+	public function setMessage($message) {
101
+		if (\is_array($this->content)) {
102 102
 			$this->content[\sizeof($this->content)-1]=$message;
103
-		}else
103
+		} else
104 104
 			$this->setContent($message);
105 105
 	}
106 106
 }
107 107
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FormTrait.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 use Ajax\semantic\html\collections\HtmlMessage;
6 6
 use Ajax\service\AjaxCall;
7 7
 
8
-trait FormTrait{
8
+trait FormTrait {
9 9
 	/**
10 10
 	 * @return HtmlForm
11 11
 	 */
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		return $this->getForm()->addToProperty("class", "loading");
16 16
 	}
17 17
 
18
-	public function addErrorMessage(){
18
+	public function addErrorMessage() {
19 19
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
20 20
 	}
21 21
 
@@ -30,35 +30,35 @@  discard block
 block discarded – undo
30 30
 	 * @param string $responseElement
31 31
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
32 32
 	 */
33
-	public function submitOn($event,$identifier,$url,$responseElement){
33
+	public function submitOn($event, $identifier, $url, $responseElement) {
34 34
 		$form=$this->getForm();
35 35
 		$elem=$form->getElementById($identifier, $form->getContent());
36
-		if(isset($elem)){
37
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
36
+		if (isset($elem)) {
37
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
38 38
 		}
39 39
 		return $form;
40 40
 	}
41 41
 
42
-	public function submitOnClick($identifier,$url,$responseElement){
42
+	public function submitOnClick($identifier, $url, $responseElement) {
43 43
 		return $this->submitOn("click", $identifier, $url, $responseElement);
44 44
 	}
45 45
 
46
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
47
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
48
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
46
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
47
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
48
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
49 49
 	}
50 50
 
51
-	protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){
51
+	protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) {
52 52
 		$form=$this->getForm();
53
-		if(isset($url) && isset($responseElement)){
53
+		if (isset($url) && isset($responseElement)) {
54 54
 			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
55
-			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url]));
55
+			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url]));
56 56
 		}
57 57
 		return $button;
58 58
 	}
59 59
 
60
-	public function addReset($identifier,$value,$cssStyle=NULL){
61
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
60
+	public function addReset($identifier, $value, $cssStyle=NULL) {
61
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
62 62
 		$bt->setProperty("type", "reset");
63 63
 		return $bt;
64 64
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * @param string $jsCode
69 69
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
70 70
 	 */
71
-	public function onValid($jsCode){
71
+	public function onValid($jsCode) {
72 72
 		$form=$this->getForm();
73 73
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
74 74
 		return $form;
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @param string $jsCode can use event and fields parameters
80 80
 	 * @return HtmlForm
81 81
 	 */
82
-	public function onSuccess($jsCode){
82
+	public function onSuccess($jsCode) {
83 83
 		$form=$this->getForm();
84 84
 		$form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%");
85 85
 		return $form;
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/HtmlTable.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 
26 26
 	public function __construct($identifier, $rowCount, $colCount) {
27 27
 		parent::__construct($identifier, "table", "ui table");
28
-		$this->content=array ();
28
+		$this->content=array();
29 29
 		$this->setRowCount($rowCount, $colCount);
30
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
31
-		$this->_compileParts=["thead","tbody","tfoot"];
30
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
31
+		$this->_compileParts=["thead", "tbody", "tfoot"];
32 32
 		$this->_afterCompileEvents=[];
33 33
 	}
34 34
 
@@ -46,9 +46,9 @@  discard block
 block discarded – undo
46 46
 	 * @return HtmlTableContent
47 47
 	 */
48 48
 	public function getPart($key) {
49
-		if (\array_key_exists($key, $this->content) === false) {
49
+		if (\array_key_exists($key, $this->content)===false) {
50 50
 			$this->content[$key]=new HtmlTableContent("", $key);
51
-			if ($key !== "tbody") {
51
+			if ($key!=="tbody") {
52 52
 				$this->content[$key]->setRowCount(1, $this->_colCount);
53 53
 			}
54 54
 		}
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return boolean
86 86
 	 */
87 87
 	public function hasPart($key) {
88
-		return \array_key_exists($key, $this->content) === true;
88
+		return \array_key_exists($key, $this->content)===true;
89 89
 	}
90 90
 
91 91
 	/**
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 
191 191
 	private function colAlign($colIndex, $function) {
192 192
 		if (\is_array($colIndex)) {
193
-			foreach ( $colIndex as $cIndex ) {
193
+			foreach ($colIndex as $cIndex) {
194 194
 				$this->colAlign($cIndex, $function);
195 195
 			}
196 196
 		} else {
@@ -229,12 +229,12 @@  discard block
 block discarded – undo
229 229
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
230 230
 	 */
231 231
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
232
-		if(\sizeof($this->_compileParts)<3){
232
+		if (\sizeof($this->_compileParts)<3) {
233 233
 			$this->_template="%content%";
234 234
 			$this->refresh();
235
-		}else{
235
+		} else {
236 236
 			if ($this->propertyContains("class", "sortable")) {
237
-				$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();");
237
+				$this->addEvent("execute", "$('#".$this->identifier."').tablesort();");
238 238
 			}
239 239
 		}
240 240
 		$this->content=JArray::sortAssociative($this->content, $this->_compileParts);
@@ -250,13 +250,13 @@  discard block
 block discarded – undo
250 250
 	public function fromDatabaseObject($object, $function) {
251 251
 		$result=$function($object);
252 252
 		if (\is_array($result)) {
253
-			$result= $this->addRow($function($object));
253
+			$result=$this->addRow($function($object));
254 254
 		} else {
255
-			$result= $this->getBody()->_addRow($result);
255
+			$result=$this->getBody()->_addRow($result);
256 256
 		}
257
-		if(isset($this->_afterCompileEvents["onNewRow"])){
258
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
259
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
257
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
258
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
259
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
260 260
 		}
261 261
 		return $result;
262 262
 	}
@@ -270,14 +270,14 @@  discard block
 block discarded – undo
270 270
 		return $this;
271 271
 	}
272 272
 
273
-	public function refresh(){
273
+	public function refresh() {
274 274
 		$this->_footer=$this->getFooter();
275 275
 		$this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");');
276 276
 	}
277 277
 
278
-	public function run(JsUtils $js){
279
-		$result= parent::run($js);
280
-		if(isset($this->_footer))
278
+	public function run(JsUtils $js) {
279
+		$result=parent::run($js);
280
+		if (isset($this->_footer))
281 281
 			$this->_footer->run($js);
282 282
 		return $result;
283 283
 	}
Please login to merge, or discard this patch.