Completed
Push — master ( e04e71...98392d )
by Jean-Christophe
03:50
created
Ajax/semantic/html/content/table/HtmlTD.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 use Ajax\semantic\html\elements\html5\HtmlLink;
11 11
 
12 12
 class HtmlTD extends HtmlSemDoubleElement {
13
-	use TextAlignmentTrait,TableElementTrait;
13
+	use TextAlignmentTrait, TableElementTrait;
14 14
 	private $_container;
15 15
 	private $_row;
16 16
 	private $_col;
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	public function __construct($identifier, $content=NULL, $tagName="td") {
25 25
 		parent::__construct($identifier, $tagName, "", $content);
26
-		$this->_variations=[ Variation::COLLAPSING ];
27
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
26
+		$this->_variations=[Variation::COLLAPSING];
27
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
28 28
 	}
29 29
 
30 30
 	public function setContainer($container, $row, $col) {
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	public function setRowspan($rowspan) {
42
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
43
-		for($i=$to; $i > $this->_row; $i--) {
42
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
43
+		for ($i=$to; $i>$this->_row; $i--) {
44 44
 			$this->_container->delete($i, $this->_col);
45 45
 		}
46 46
 		$this->setProperty("rowspan", $rowspan);
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function setColspan($colspan) {
59
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
60
-		for($i=$to; $i > $this->_col; $i--) {
61
-			$this->_container->delete($this->_row, $this->_col + 1);
59
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
60
+		for ($i=$to; $i>$this->_col; $i--) {
61
+			$this->_container->delete($this->_row, $this->_col+1);
62 62
 		}
63 63
 		$this->setProperty("colspan", $colspan);
64 64
 		return $this->_container;
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButtonGroups.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
14 14
 
15 15
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
16 16
 		parent::__construct($identifier, "div", "ui buttons");
17
-		$this->content=array ();
18
-		if ($asIcons === true)
17
+		$this->content=array();
18
+		if ($asIcons===true)
19 19
 			$this->asIcons();
20 20
 		$this->addElements($elements, $asIcons);
21 21
 	}
@@ -24,25 +24,25 @@  discard block
 block discarded – undo
24 24
 		$elementO=$element;
25 25
 		if (\is_string($element)) {
26 26
 			if ($asIcon) {
27
-				$elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content));
27
+				$elementO=new HtmlButton("button-".$this->identifier."-".\sizeof($this->content));
28 28
 				$elementO->asIcon($element);
29
-			} else
30
-				$elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content), $element);
29
+			}else
30
+				$elementO=new HtmlButton("button-".$this->identifier."-".\sizeof($this->content), $element);
31 31
 		}
32 32
 		$this->addContent($elementO);
33 33
 	}
34 34
 
35 35
 	public function addElements($elements, $asIcons=false) {
36
-		foreach ( $elements as $element ) {
36
+		foreach ($elements as $element) {
37 37
 			$this->addElement($element, $asIcons);
38 38
 		}
39 39
 		return $this;
40 40
 	}
41 41
 
42 42
 	public function insertOr($aferIndex=0, $or="or") {
43
-		$orElement=new HtmlSemDoubleElement("or-" . $this->identifier, "div", "or");
43
+		$orElement=new HtmlSemDoubleElement("or-".$this->identifier, "div", "or");
44 44
 		$orElement->setProperty("data-text", $or);
45
-		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
45
+		array_splice($this->content, $aferIndex+1, 0, array($orElement));
46 46
 		return $this;
47 47
 	}
48 48
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function asIcons() {
58
-		foreach ( $this->content as $item ) {
58
+		foreach ($this->content as $item) {
59 59
 			$item->asIcon($item->getContent());
60 60
 		}
61 61
 		return $this->addToProperty("class", "icons");
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
94 94
 	 */
95 95
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
96
-		foreach ( $this->content as $element ) {
96
+		foreach ($this->content as $element) {
97 97
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
98 98
 		}
99 99
 		return $this;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 	public function addClasses($classes=array()) {
107 107
 		$i=0;
108
-		foreach ( $this->content as $button ) {
108
+		foreach ($this->content as $button) {
109 109
 			$button->addToProperty("class", $classes[$i++]);
110 110
 		}
111 111
 		return $this;
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlProgress.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,26 +9,26 @@  discard block
 block discarded – undo
9 9
 use Ajax\semantic\html\base\constants\State;
10 10
 
11 11
 class HtmlProgress extends HtmlSemDoubleElement {
12
-	private $_params=array ();
12
+	private $_params=array();
13 13
 
14 14
 	public function __construct($identifier, $value=NULL, $label=NULL, $attributes=array()) {
15 15
 		parent::__construct($identifier, "div", "ui progress");
16
-		if (isset($value) === true)
16
+		if (isset($value)===true)
17 17
 			$this->setProperty("data-percent", $value);
18 18
 		$this->createBar();
19
-		if (isset($label) === true)
19
+		if (isset($label)===true)
20 20
 			$this->setLabel($label);
21
-		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
21
+		$this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED];
22 22
 		$this->addToProperty("class", $attributes);
23 23
 	}
24 24
 
25 25
 	public function setLabel($label) {
26
-		$this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label);
26
+		$this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label);
27 27
 		return $this;
28 28
 	}
29 29
 
30 30
 	private function createBar() {
31
-		$bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress"));
31
+		$bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress"));
32 32
 		$this->content["bar"]=$bar;
33 33
 		return $this;
34 34
 	}
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
68 68
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
69 69
 	 */
70 70
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
71
-		$this->content=JArray::sortAssociative($this->content, [ "bar","label" ]);
71
+		$this->content=JArray::sortAssociative($this->content, ["bar", "label"]);
72 72
 		return parent::compile($js, $view);
73 73
 	}
74 74
 
75 75
 	public function jsSetValue($value) {
76
-		return '$("#' . $this->identifier . '").progress({value:' . $value . '});';
76
+		return '$("#'.$this->identifier.'").progress({value:'.$value.'});';
77 77
 	}
78 78
 
79 79
 	public function jsIncValue() {
80
-		return '$("#' . $this->identifier . '").progress("increment");';
80
+		return '$("#'.$this->identifier.'").progress("increment");';
81 81
 	}
82 82
 
83 83
 	public function jsDecValue() {
84
-		return '$("#' . $this->identifier . '").progress("decrement");';
84
+		return '$("#'.$this->identifier.'").progress("decrement");';
85 85
 	}
86 86
 
87 87
 	/**
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return HtmlProgress
96 96
 	 */
97 97
 	public function setTextValues($active=false, $error=false, $success=false, $warning=false, $percent="{percent}%", $ratio="{value} of {total}") {
98
-		if (\is_array($active) == true) {
98
+		if (\is_array($active)==true) {
99 99
 			$array=$active;
100 100
 			$active=JArray::getDefaultValue($array, "active", false);
101 101
 			$success=JArray::getDefaultValue($array, "success", $success);
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
 			$percent=JArray::getDefaultValue($array, "percent", $percent);
104 104
 			$ratio=JArray::getDefaultValue($array, "ratio", $ratio);
105 105
 		}
106
-		$this->_params["text"]="%{active  : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio   : " . \var_export($ratio, true) . "}%";
106
+		$this->_params["text"]="%{active  : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio   : ".\var_export($ratio, true)."}%";
107 107
 		return $this;
108 108
 	}
109 109
 
110 110
 	public function onChange($jsCode) {
111
-		return $this->_params["onChange"]="%function(percent, value, total){" . $jsCode . "}%";
111
+		return $this->_params["onChange"]="%function(percent, value, total){".$jsCode."}%";
112 112
 	}
113 113
 
114 114
 	/*
@@ -116,8 +116,8 @@  discard block
 block discarded – undo
116 116
 	 * @see BaseHtml::run()
117 117
 	 */
118 118
 	public function run(JsUtils $js) {
119
-		if (isset($this->_bsComponent) === false)
120
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
119
+		if (isset($this->_bsComponent)===false)
120
+			$this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params);
121 121
 		$this->addEventsOnRun($js);
122 122
 		return $this->_bsComponent;
123 123
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlForm.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 
22 22
 	public function __construct($identifier, $elements=array()) {
23 23
 		parent::__construct($identifier, "form", "ui form");
24
-		$this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ];
24
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
25 25
 		$this->setProperty("name", $this->identifier);
26
-		$this->_fields=array ();
26
+		$this->_fields=array();
27 27
 		$this->addItems($elements);
28 28
 	}
29 29
 
@@ -37,22 +37,22 @@  discard block
 block discarded – undo
37 37
 	public function addFields($fields=NULL, $label=NULL) {
38 38
 		if (isset($fields)) {
39 39
 			if (!$fields instanceof HtmlFormFields) {
40
-				if (\is_array($fields) === false) {
40
+				if (\is_array($fields)===false) {
41 41
 					$fields=\func_get_args();
42 42
 					$end=\end($fields);
43 43
 					if (\is_string($end)) {
44 44
 						$label=$end;
45 45
 						\array_pop($fields);
46
-					} else
46
+					}else
47 47
 						$label=NULL;
48 48
 				}
49 49
 				$this->_fields=\array_merge($this->_fields, $fields);
50
-				$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields);
50
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
51 51
 			}
52 52
 			if (isset($label))
53 53
 				$fields=new HtmlFormField("", $fields, $label);
54
-		} else {
55
-			$fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count());
54
+		}else {
55
+			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
56 56
 		}
57 57
 		$this->addItem($fields);
58 58
 		return $fields;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 	public function addItem($item) {
62 62
 		$item=parent::addItem($item);
63
-		if (\is_subclass_of($item, HtmlFormField::class) === true) {
63
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
64 64
 			$this->_fields[]=$item;
65 65
 		}
66 66
 		return $item;
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	public function getField($index) {
70 70
 		if (\is_string($index)) {
71 71
 			$field=$this->getElementById($index, $this->_fields);
72
-		} else {
72
+		}else {
73 73
 			$field=$this->_fields[$index];
74 74
 		}
75 75
 		return $field;
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct(JsUtils $js) {
18 18
 		parent::__construct($js);
19
-		$this->events=array ();
19
+		$this->events=array();
20 20
 	}
21 21
 
22 22
 	protected function compileEvents() {
23
-		foreach ( $this->events as $event => $jsCode ) {
24
-			if($event=="execute"){
23
+		foreach ($this->events as $event => $jsCode) {
24
+			if ($event=="execute") {
25 25
 				$this->jquery_code_for_compile []=$jsCode;
26
-			}else if($event=="beforeExecute"){
26
+			}else if ($event=="beforeExecute") {
27 27
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
28 28
 			}else
29 29
 				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		$result=implode("\n", $this->jquery_code_for_compile);
35 35
 		$result=str_ireplace("\"%", "", $result);
36 36
 		$result=str_ireplace("%\"", "", $result);
37
-		$result=str_replace(array (
37
+		$result=str_replace(array(
38 38
 				"\\n",
39 39
 				"\\r",
40 40
 				"\\t"
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	public function getScript() {
46 46
 		$allParams=$this->params;
47
-		$this->jquery_code_for_compile=array ();
47
+		$this->jquery_code_for_compile=array();
48 48
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
49 49
 		$this->compileEvents();
50 50
 		return $this->compileJQueryCode();
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		if (is_array($typeCtrl)) {
72 72
 			if (array_search($value, $typeCtrl)===false)
73 73
 				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
74
-		} else {
74
+		}else {
75 75
 			if (!$typeCtrl($value)) {
76 76
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
77 77
 			}
Please login to merge, or discard this patch.
Ajax/semantic/components/search/SearchCategory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 
26 26
 	public function __toString() {
27
-		$result="\"" . $this->id . "\": { \"name\": \"" . $this->name . "\"," . $this->results . "}";
27
+		$result="\"".$this->id."\": { \"name\": \"".$this->name."\",".$this->results."}";
28 28
 		return $result;
29 29
 	}
30 30
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 	public function search($query, $field="title") {
59 59
 		$result=$this->results->search($query, $field);
60
-		if ($result !== false) {
60
+		if ($result!==false) {
61 61
 			return new SearchCategory($this->id, $this->name, $result);
62 62
 		}
63 63
 		return false;
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlInput.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 	use IconTrait;
13 13
 
14 14
 	public function __construct($identifier, $type="text", $value="", $placeholder="") {
15
-		parent::__construct("div-" . $identifier, "div", "ui input");
16
-		$this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ];
17
-		$this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ];
18
-		$this->_variations=[ Variation::TRANSPARENT ];
15
+		parent::__construct("div-".$identifier, "div", "ui input");
16
+		$this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)];
17
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
18
+		$this->_variations=[Variation::TRANSPARENT];
19 19
 	}
20 20
 
21 21
 	public function setFocus() {
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	}
24 24
 
25 25
 	public function addLoading() {
26
-		if ($this->_hasIcon === false) {
26
+		if ($this->_hasIcon===false) {
27 27
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
28 28
 		}
29 29
 		return $this->addToProperty("class", State::LOADING);
@@ -31,31 +31,31 @@  discard block
 block discarded – undo
31 31
 
32 32
 	public function labeled($label, $direction=Direction::LEFT, $icon=NULL) {
33 33
 		$labelO=$label;
34
-		if (\is_object($label) === false) {
35
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
34
+		if (\is_object($label)===false) {
35
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
36 36
 			if (isset($icon))
37 37
 				$labelO->addIcon($icon);
38
-		} else {
39
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
38
+		}else {
39
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
40 40
 		}
41
-		$this->addToProperty("class", $direction . " labeled");
42
-		$this->addContent($labelO, \strstr($direction, Direction::LEFT) !== false);
41
+		$this->addToProperty("class", $direction." labeled");
42
+		$this->addContent($labelO, \strstr($direction, Direction::LEFT)!==false);
43 43
 		return $labelO;
44 44
 	}
45 45
 
46 46
 	public function labeledToCorner($label, $direction=Direction::LEFT, $icon=NULL) {
47
-		return $this->labeled($label, $direction . " corner", $icon)->toCorner($direction);
47
+		return $this->labeled($label, $direction." corner", $icon)->toCorner($direction);
48 48
 	}
49 49
 
50 50
 	public function addAction($action, $direction=Direction::LEFT, $icon=NULL, $labeled=false) {
51 51
 		$actionO=$action;
52
-		if (\is_object($action) === false) {
53
-			$actionO=new HtmlButton("action-" . $this->identifier, $action);
52
+		if (\is_object($action)===false) {
53
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
54 54
 			if (isset($icon))
55 55
 				$actionO->addIcon($icon, true, $labeled);
56 56
 		}
57
-		$this->addToProperty("class", $direction . " action");
58
-		$this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false);
57
+		$this->addToProperty("class", $direction." action");
58
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
59 59
 		return $actionO;
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
Ajax/semantic/components/search/SearchCategories.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,25 +6,25 @@  discard block
 block discarded – undo
6 6
 	private $categories;
7 7
 
8 8
 	public function __construct() {
9
-		$this->categories=array ();
9
+		$this->categories=array();
10 10
 	}
11 11
 
12 12
 	public function add($results, $category) {
13 13
 		$count=\sizeof($this->categories);
14 14
 		if (\array_key_exists($category, $this->categories)) {
15 15
 			$this->categories[$category]->addResults($results);
16
-		} else {
17
-			$categoryO=new SearchCategory("category" . $count, $category, $results);
16
+		}else {
17
+			$categoryO=new SearchCategory("category".$count, $category, $results);
18 18
 			$this->categories[$category]=$categoryO;
19 19
 		}
20 20
 		return $this;
21 21
 	}
22 22
 
23 23
 	public function search($query, $field="title") {
24
-		$result=array ();
25
-		foreach ( $this->categories as $category ) {
24
+		$result=array();
25
+		foreach ($this->categories as $category) {
26 26
 			$r=$category->search($query, $field);
27
-			if ($r !== false)
27
+			if ($r!==false)
28 28
 				$result[]=$r;
29 29
 		}
30 30
 		$this->categories=$result;
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 
34 34
 	public function __toString() {
35
-		return "{\"results\":{" . \implode(",", \array_values($this->categories)) . "}}";
35
+		return "{\"results\":{".\implode(",", \array_values($this->categories))."}}";
36 36
 	}
37 37
 
38 38
 	public function getResponse() {
Please login to merge, or discard this patch.
Ajax/semantic/components/search/AbstractSearchResult.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 	public function fromDatabaseObjects($objects, $function) {
8 8
 		if (isset($objects)) {
9
-			foreach ( $objects as $object ) {
9
+			foreach ($objects as $object) {
10 10
 				$this->fromDatabaseObject($object, $function);
11 11
 			}
12 12
 		}
Please login to merge, or discard this patch.