Completed
Push — master ( b46a1a...696c6e )
by Jean-Christophe
04:33 queued 01:46
created
Ajax/semantic/html/content/HtmlStepItem.php 2 patches
Braces   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 				$title=@$content[1];
18 18
 				$desc=@$content[2];
19 19
 				$status=@$content[3];
20
-			}else{
20
+			} else{
21 21
 				$icon=@$content["icon"];
22 22
 				$title=@$content["title"];
23 23
 				$desc=@$content["description"];
@@ -32,16 +32,17 @@  discard block
 block discarded – undo
32 32
 			if(isset($title)){
33 33
 				$this->setTitle($title,$desc);
34 34
 			}
35
-		}else{
35
+		} else{
36 36
 			$this->setContent($content);
37 37
 		}
38 38
 	}
39 39
 
40 40
 	public function setActive($value=true){
41
-		if($value)
42
-			$this->setStatus(StepStatus::ACTIVE);
43
-		else
44
-			$this->setStatus(StepStatus::NONE);
41
+		if($value) {
42
+					$this->setStatus(StepStatus::ACTIVE);
43
+		} else {
44
+					$this->setStatus(StepStatus::NONE);
45
+		}
45 46
 		return $this;
46 47
 	}
47 48
 
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -8,53 +8,53 @@
 block discarded – undo
8 8
 class HtmlStepItem extends HtmlAbsractItem {
9 9
 
10 10
 	public function __construct($identifier, $content) {
11
-		parent::__construct($identifier,"step",$content);
11
+		parent::__construct($identifier, "step", $content);
12 12
 	}
13
-	protected function initContent($content){
14
-		if(\is_array($content)){
15
-			if(JArray::isAssociative($content)===false){
13
+	protected function initContent($content) {
14
+		if (\is_array($content)) {
15
+			if (JArray::isAssociative($content)===false) {
16 16
 				$icon=@$content[0];
17 17
 				$title=@$content[1];
18 18
 				$desc=@$content[2];
19 19
 				$status=@$content[3];
20
-			}else{
20
+			} else {
21 21
 				$icon=@$content["icon"];
22 22
 				$title=@$content["title"];
23 23
 				$desc=@$content["description"];
24 24
 				$status=@$content["status"];
25 25
 			}
26
-			if(isset($icon)){
26
+			if (isset($icon)) {
27 27
 				$this->setIcon($icon);
28 28
 			}
29
-			if(isset($status)){
29
+			if (isset($status)) {
30 30
 				$this->setStatus($status);
31 31
 			}
32
-			if(isset($title)){
33
-				$this->setTitle($title,$desc);
32
+			if (isset($title)) {
33
+				$this->setTitle($title, $desc);
34 34
 			}
35
-		}else{
35
+		} else {
36 36
 			$this->setContent($content);
37 37
 		}
38 38
 	}
39 39
 
40
-	public function setActive($value=true){
41
-		if($value)
40
+	public function setActive($value=true) {
41
+		if ($value)
42 42
 			$this->setStatus(StepStatus::ACTIVE);
43 43
 		else
44 44
 			$this->setStatus(StepStatus::NONE);
45 45
 		return $this;
46 46
 	}
47 47
 
48
-	public function setCompleted(){
49
-		$this->removePropertyValues("class", [StepStatus::COMPLETED,StepStatus::DISABLED]);
48
+	public function setCompleted() {
49
+		$this->removePropertyValues("class", [StepStatus::COMPLETED, StepStatus::DISABLED]);
50 50
 		return $this->setStatus(StepStatus::COMPLETED);
51 51
 	}
52 52
 
53
-	public function setStatus($status){
53
+	public function setStatus($status) {
54 54
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
55 55
 	}
56 56
 
57
-	public function removeStatus(){
57
+	public function removeStatus() {
58 58
 		$this->removePropertyValues("class", StepStatus::getConstants());
59 59
 	}
60 60
 }
Please login to merge, or discard this patch.
Ajax/Semantic.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 use Ajax\semantic\traits\SemanticWidgetsTrait;
12 12
 
13 13
 class Semantic extends BaseGui {
14
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait,
15
-	SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait;
14
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait,
15
+	SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait;
16 16
 
17 17
 	private $language;
18 18
 
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 
24
-	public function setLanguage($language){
25
-		if($language!==$this->language){
24
+	public function setLanguage($language) {
25
+		if ($language!==$this->language) {
26 26
 			$file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js");
27
-			if(\file_exists($file)){
27
+			if (\file_exists($file)) {
28 28
 				$script=\file_get_contents($file);
29
-				$this->js->exec($script,true);
29
+				$this->js->exec($script, true);
30 30
 				$this->language=$language;
31 31
 			}
32 32
 		}
Please login to merge, or discard this patch.
Ajax/common/components/BaseComponent.php 2 patches
Braces   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,8 +39,9 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function getParam($key) {
41 41
 		$value=null;
42
-		if (array_key_exists($key, $this->params))
43
-			$value=$this->params [$key];
42
+		if (array_key_exists($key, $this->params)) {
43
+					$value=$this->params [$key];
44
+		}
44 45
 		return $value;
45 46
 	}
46 47
 
@@ -49,16 +50,18 @@  discard block
 block discarded – undo
49 50
 	}
50 51
 
51 52
 	public function compile(JsUtils $js=NULL) {
52
-		if ($js==NULL)
53
-			$js=$this->js;
53
+		if ($js==NULL) {
54
+					$js=$this->js;
55
+		}
54 56
 		$script=$this->getScript();
55 57
 		$js->addToCompile($script);
56 58
 	}
57 59
 
58 60
 	protected function setParamCtrl($key, $value, $typeCtrl) {
59 61
 		if (\is_array($typeCtrl)) {
60
-			if (array_search($value, $typeCtrl)===false)
61
-				throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
62
+			if (array_search($value, $typeCtrl)===false) {
63
+							throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
64
+			}
62 65
 		} else {
63 66
 			if (!$typeCtrl($value)) {
64 67
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key);
@@ -70,9 +73,9 @@  discard block
 block discarded – undo
70 73
 	public function setParams($params) {
71 74
 		foreach ( $params as $k => $v ) {
72 75
 			$method="set".ucfirst($k);
73
-			if (method_exists($this, $method))
74
-				$this->$method($v);
75
-			else {
76
+			if (method_exists($this, $method)) {
77
+							$this->$method($v);
78
+			} else {
76 79
 				$this->setParam($k, $v);
77 80
 				trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE);
78 81
 			}
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
  * @version 1.001
11 11
  */
12 12
 abstract class BaseComponent {
13
-	public $jquery_code_for_compile=array ();
14
-	protected $params=array ();
13
+	public $jquery_code_for_compile=array();
14
+	protected $params=array();
15 15
 
16 16
 	/**
17 17
 	 *
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 
70 70
 	public function setParams($params) {
71
-		foreach ( $params as $k => $v ) {
71
+		foreach ($params as $k => $v) {
72 72
 			$method="set".ucfirst($k);
73 73
 			if (method_exists($this, $method))
74 74
 				$this->$method($v);
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 		return $this;
82 82
 	}
83 83
 
84
-	public function addParams($params){
85
-		foreach ($params as $k=>$v){
84
+	public function addParams($params) {
85
+		foreach ($params as $k=>$v) {
86 86
 				$this->setParam($k, $v);
87 87
 		}
88 88
 		return $this;
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
 	abstract public function getScript();
92 92
 
93
-	public function setDebug($value){
93
+	public function setDebug($value) {
94 94
 		return $this->setParam("debug", $value);
95 95
 	}
96 96
 
97
-	public function setVerbose($value){
97
+	public function setVerbose($value) {
98 98
 		return $this->setParam("verbose", $value);
99 99
 	}
100 100
 }
Please login to merge, or discard this patch.
Ajax/common/html/HtmlCollection.php 3 patches
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 			foreach ($items as $k=>$v){
23 23
 				$this->addItem([$k,$v]);
24 24
 			}
25
-		}else{
25
+		} else{
26 26
 			foreach ($items as $item){
27 27
 				$this->addItem($item);
28 28
 			}
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return \Ajax\common\html\HtmlDoubleElement
71 71
 	 */
72 72
 	public function getItem($index) {
73
-		if (is_int($index))
74
-			return $this->content[$index];
75
-		else {
73
+		if (is_int($index)) {
74
+					return $this->content[$index];
75
+		} else {
76 76
 			$elm=$this->getElementById($index, $this->content);
77 77
 			return $elm;
78 78
 		}
@@ -134,10 +134,11 @@  discard block
 block discarded – undo
134 134
 		$i=0;
135 135
 		foreach ($properties as $k=>$v){
136 136
 			$c=$this->content[$i++];
137
-			if(isset($c))
138
-				$c->setProperty($k,$v);
139
-			else
140
-				return $this;
137
+			if(isset($c)) {
138
+							$c->setProperty($k,$v);
139
+			} else {
140
+							return $this;
141
+			}
141 142
 		}
142 143
 		return $this;
143 144
 	}
@@ -151,8 +152,7 @@  discard block
 block discarded – undo
151 152
 			$c=$this->content[$i++];
152 153
 			if(isset($c)){
153 154
 				$c->setProperty($property,$value);
154
-			}
155
-			else{
155
+			} else{
156 156
 				return $this;
157 157
 			}
158 158
 		}
Please login to merge, or discard this patch.
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -50,6 +50,10 @@  discard block
 block discarded – undo
50 50
 		return $itemO;
51 51
 	}
52 52
 
53
+	/**
54
+	 * @param string $classname
55
+	 * @param integer $index
56
+	 */
53 57
 	protected function setItemIdentifier($item,$classname,$index){
54 58
 		if($item instanceof BaseWidget){
55 59
 			if(JString::isNull($item->getIdentifier())){
@@ -94,6 +98,9 @@  discard block
 block discarded – undo
94 98
 		return $this;
95 99
 	}
96 100
 
101
+	/**
102
+	 * @param integer $index
103
+	 */
97 104
 	public function removeItem($index){
98 105
 		return array_splice($this->content, $index, 1);
99 106
 	}
@@ -109,6 +116,9 @@  discard block
 block discarded – undo
109 116
 		return $this->addItem($function($object));
110 117
 	}
111 118
 
119
+	/**
120
+	 * @param \Closure $callBack
121
+	 */
112 122
 	public function apply($callBack){
113 123
 		foreach ($this->content as $item){
114 124
 			$callBack($item);
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -15,44 +15,44 @@  discard block
 block discarded – undo
15 15
  */
16 16
 abstract class HtmlCollection extends HtmlDoubleElement {
17 17
 
18
-	public function __construct($identifier,$tagName="div"){
19
-		parent::__construct($identifier,$tagName);
18
+	public function __construct($identifier, $tagName="div") {
19
+		parent::__construct($identifier, $tagName);
20 20
 		$this->content=array();
21 21
 	}
22 22
 
23
-	public function addItems($items){
24
-		if(JArray::isAssociative($items)){
25
-			foreach ($items as $k=>$v){
26
-				$this->addItem([$k,$v]);
23
+	public function addItems($items) {
24
+		if (JArray::isAssociative($items)) {
25
+			foreach ($items as $k=>$v) {
26
+				$this->addItem([$k, $v]);
27 27
 			}
28
-		}else{
29
-			foreach ($items as $item){
28
+		} else {
29
+			foreach ($items as $item) {
30 30
 				$this->addItem($item);
31 31
 			}
32 32
 		}
33 33
 		return $this;
34 34
 	}
35 35
 
36
-	public function setItems($items){
36
+	public function setItems($items) {
37 37
 		$this->content=$items;
38 38
 		return $this;
39 39
 	}
40 40
 
41
-	public function getItems(){
41
+	public function getItems() {
42 42
 		return $this->content;
43 43
 	}
44 44
 
45
-	protected function getItemToAdd($item){
45
+	protected function getItemToAdd($item) {
46 46
 		$itemO=$item;
47
-		if($this->createCondition($item)===true){
47
+		if ($this->createCondition($item)===true) {
48 48
 			$itemO=$this->createItem($item);
49 49
 		}
50 50
 		return $itemO;
51 51
 	}
52 52
 
53
-	protected function setItemIdentifier($item,$classname,$index){
54
-		if($item instanceof BaseWidget){
55
-			if(JString::isNull($item->getIdentifier())){
53
+	protected function setItemIdentifier($item, $classname, $index) {
54
+		if ($item instanceof BaseWidget) {
55
+			if (JString::isNull($item->getIdentifier())) {
56 56
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
57 57
 			}
58 58
 		}
@@ -63,15 +63,15 @@  discard block
 block discarded – undo
63 63
 	 * @param HtmlDoubleElement|string|array $item
64 64
 	 * @return \Ajax\common\html\HtmlDoubleElement
65 65
 	 */
66
-	public function addItem($item){
66
+	public function addItem($item) {
67 67
 		$itemO=$this->getItemToAdd($item);
68 68
 		$this->addContent($itemO);
69 69
 		return $itemO;
70 70
 	}
71 71
 
72
-	public function insertItem($item,$position=0){
72
+	public function insertItem($item, $position=0) {
73 73
 		$itemO=$this->getItemToAdd($item);
74
-		\array_splice( $this->content, $position, 0, array($itemO));
74
+		\array_splice($this->content, $position, 0, array($itemO));
75 75
 		return $itemO;
76 76
 	}
77 77
 
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 		return $this;
95 95
 	}
96 96
 
97
-	public function removeItem($index){
97
+	public function removeItem($index) {
98 98
 		return array_splice($this->content, $index, 1);
99 99
 	}
100 100
 
101
-	public function count(){
101
+	public function count() {
102 102
 		return \sizeof($this->content);
103 103
 	}
104 104
 
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 		return $this->addItem($function($object));
110 110
 	}
111 111
 
112
-	public function apply($callBack){
113
-		foreach ($this->content as $item){
112
+	public function apply($callBack) {
113
+		foreach ($this->content as $item) {
114 114
 			$callBack($item);
115 115
 		}
116 116
 		return $this;
@@ -130,23 +130,23 @@  discard block
 block discarded – undo
130 130
 	 */
131 131
 	abstract protected function createItem($value);
132 132
 
133
-	protected function createCondition($value){
133
+	protected function createCondition($value) {
134 134
 		return \is_object($value)===false;
135 135
 	}
136 136
 
137
-	protected function contentAs($tagName){
138
-		foreach ($this->content as $item){
137
+	protected function contentAs($tagName) {
138
+		foreach ($this->content as $item) {
139 139
 			$item->setTagName($tagName);
140 140
 		}
141 141
 		return $this;
142 142
 	}
143 143
 
144
-	public function setProperties($properties){
144
+	public function setProperties($properties) {
145 145
 		$i=0;
146
-		foreach ($properties as $k=>$v){
146
+		foreach ($properties as $k=>$v) {
147 147
 			$c=$this->content[$i++];
148
-			if(isset($c))
149
-				$c->setProperty($k,$v);
148
+			if (isset($c))
149
+				$c->setProperty($k, $v);
150 150
 			else
151 151
 				return $this;
152 152
 		}
@@ -159,17 +159,17 @@  discard block
 block discarded – undo
159 159
 	 * @param array $values
160 160
 	 * @return HtmlCollection
161 161
 	 */
162
-	public function setPropertyValues($property,$values){
162
+	public function setPropertyValues($property, $values) {
163 163
 		$i=0;
164
-		if(\is_array($values)===false){
165
-			$values=\array_fill(0, $this->count(),$values);
164
+		if (\is_array($values)===false) {
165
+			$values=\array_fill(0, $this->count(), $values);
166 166
 		}
167
-		foreach ($values as $value){
167
+		foreach ($values as $value) {
168 168
 			$c=$this->content[$i++];
169
-			if(isset($c)){
170
-				$c->setProperty($property,$value);
169
+			if (isset($c)) {
170
+				$c->setProperty($property, $value);
171 171
 			}
172
-			else{
172
+			else {
173 173
 				return $this;
174 174
 			}
175 175
 		}
@@ -179,13 +179,13 @@  discard block
 block discarded – undo
179 179
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
180 180
 		$index=0;
181 181
 		$classname=\strtolower(JReflection::shortClassName($this));
182
-		foreach ($this->content as $item){
183
-			$this->setItemIdentifier($item,$classname,$index++);
182
+		foreach ($this->content as $item) {
183
+			$this->setItemIdentifier($item, $classname, $index++);
184 184
 		}
185
-		return parent::compile($js,$view);
185
+		return parent::compile($js, $view);
186 186
 	}
187 187
 
188
-	public function getItemById($identifier){
188
+	public function getItemById($identifier) {
189 189
 		return $this->getElementById($identifier, $this->content);
190 190
 	}
191 191
 }
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlTextarea.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,18 +12,21 @@
 block discarded – undo
12 12
 		$this->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
16
-			$this->setRows($rows);
15
+		if(isset($rows)) {
16
+					$this->setRows($rows);
17
+		}
17 18
 	}
18 19
 	public function setValue($value) {
19
-		if(isset($value))
20
-			$this->setContent($value);
20
+		if(isset($value)) {
21
+					$this->setContent($value);
22
+		}
21 23
 		return $this;
22 24
 	}
23 25
 
24 26
 	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
26
-			$this->setProperty("placeholder", $value);
27
+		if(JString::isNotNull($value)) {
28
+					$this->setProperty("placeholder", $value);
29
+		}
27 30
 		return $this;
28 31
 	}
29 32
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,27 +7,27 @@
 block discarded – undo
7 7
 
8 8
 class HtmlTextarea extends HtmlDoubleElement {
9 9
 
10
-	public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) {
10
+	public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) {
11 11
 		parent::__construct($identifier, "textarea");
12 12
 		$this->setProperty("name", $identifier);
13 13
 		$this->setValue($value);
14 14
 		$this->setPlaceholder($placeholder);
15
-		if(isset($rows))
15
+		if (isset($rows))
16 16
 			$this->setRows($rows);
17 17
 	}
18 18
 	public function setValue($value) {
19
-		if(isset($value))
19
+		if (isset($value))
20 20
 			$this->setContent($value);
21 21
 		return $this;
22 22
 	}
23 23
 
24
-	public function setPlaceholder($value){
25
-		if(JString::isNotNull($value))
24
+	public function setPlaceholder($value) {
25
+		if (JString::isNotNull($value))
26 26
 			$this->setProperty("placeholder", $value);
27 27
 		return $this;
28 28
 	}
29 29
 
30
-	public function setRows($count){
30
+	public function setRows($count) {
31 31
 		$this->setProperty("rows", $count);
32 32
 	}
33 33
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlSegmentGroups.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,20 +7,20 @@  discard block
 block discarded – undo
7 7
 use Ajax\semantic\html\base\constants\Sens;
8 8
 use Ajax\JsUtils;
9 9
 
10
-class HtmlSegmentGroups extends HtmlSemCollection{
10
+class HtmlSegmentGroups extends HtmlSemCollection {
11 11
 
12 12
 
13
-	public function __construct( $identifier, $items=array()){
14
-		parent::__construct( $identifier, "div","ui segments");
13
+	public function __construct($identifier, $items=array()) {
14
+		parent::__construct($identifier, "div", "ui segments");
15 15
 		$this->addItems($items);
16 16
 	}
17 17
 
18 18
 
19
-	protected function createItem($value){
20
-		return new HtmlSegment("segment-".$this->count(),$value);
19
+	protected function createItem($value) {
20
+		return new HtmlSegment("segment-".$this->count(), $value);
21 21
 	}
22 22
 
23
-	protected function createCondition($value){
23
+	protected function createCondition($value) {
24 24
 		return !($value instanceof HtmlSegment);
25 25
 	}
26 26
 
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type one of "raised","stacked","piled" default : ""
30 30
 	 * @return \Ajax\semantic\html\elements\HtmlSegmentGroups
31 31
 	 */
32
-	public function setType($type){
32
+	public function setType($type) {
33 33
 		return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants());
34 34
 	}
35 35
 
36
-	public function setSens($sens=Sens::VERTICAL){
36
+	public function setSens($sens=Sens::VERTICAL) {
37 37
 		return $this->addToPropertyCtrl("class", $sens, Sens::getConstants());
38 38
 	}
39 39
 
40
-	public function run(JsUtils $js){
41
-		$result= parent::run($js);
40
+	public function run(JsUtils $js) {
41
+		$result=parent::run($js);
42 42
 		return $result->setItemSelector(".ui.segment");
43 43
 	}
44 44
 
45
-	public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){
46
-		$group=new HtmlSegmentGroups($identifier,$items);
45
+	public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) {
46
+		$group=new HtmlSegmentGroups($identifier, $items);
47 47
 		$group->setSens($sens);
48 48
 		return $group->setType($type);
49 49
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlGrid.php 3 patches
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@  discard block
 block discarded – undo
32 32
 			// }
33 33
 			$this->setWide($numCols);
34 34
 		}
35
-		if($createCols)
36
-			$this->setRowsCount($numRows, $numCols);
35
+		if($createCols) {
36
+					$this->setRowsCount($numRows, $numCols);
37
+		}
37 38
 	}
38 39
 
39 40
 	public function asSegment() {
@@ -85,8 +86,9 @@  discard block
 block discarded – undo
85 86
 	public function addCol($width=NULL) {
86 87
 		$colCount=$this->colCount() + 1;
87 88
 		$this->setColsCount($colCount, true, $width);
88
-		if ($this->hasOnlyCols($this->count()))
89
-			return $this->content[$colCount - 1];
89
+		if ($this->hasOnlyCols($this->count())) {
90
+					return $this->content[$colCount - 1];
91
+		}
90 92
 		return $this;
91 93
 	}
92 94
 
@@ -174,8 +176,9 @@  discard block
 block discarded – undo
174 176
 	 */
175 177
 	public function rowCount() {
176 178
 		$count=$this->count();
177
-		if ($this->hasOnlyCols($count))
178
-			return 0;
179
+		if ($this->hasOnlyCols($count)) {
180
+					return 0;
181
+		}
179 182
 		return $count;
180 183
 	}
181 184
 
@@ -185,10 +188,12 @@  discard block
 block discarded – undo
185 188
 	 */
186 189
 	public function colCount() {
187 190
 		$count=$this->count();
188
-		if ($this->hasOnlyCols($count))
189
-			return $count;
190
-		if ($count > 0)
191
-			return $this->getItem(0)->count();
191
+		if ($this->hasOnlyCols($count)) {
192
+					return $count;
193
+		}
194
+		if ($count > 0) {
195
+					return $this->getItem(0)->count();
196
+		}
192 197
 		return 0;
193 198
 	}
194 199
 
@@ -199,8 +204,9 @@  discard block
 block discarded – undo
199 204
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
200 205
 	 */
201 206
 	public function getCell($row, $col) {
202
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
203
-			return $this->getItem($col);
207
+		if ($row < 2 && $this->hasOnlyCols($this->count())) {
208
+					return $this->getItem($col);
209
+		}
204 210
 		$row=$this->getItem($row);
205 211
 		if (isset($row)) {
206 212
 			$col=$row->getItem($col);
@@ -249,8 +255,9 @@  discard block
 block discarded – undo
249 255
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
250 256
 	 */
251 257
 	public function setPadded($value=NULL) {
252
-		if (isset($value))
253
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
258
+		if (isset($value)) {
259
+					$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
260
+		}
254 261
 		return $this->addToProperty("class", "padded");
255 262
 	}
256 263
 
@@ -275,8 +282,9 @@  discard block
 block discarded – undo
275 282
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
276 283
 	 */
277 284
 	protected function createItem($value) {
278
-		if ($this->_createCols === false)
279
-			$value=null;
285
+		if ($this->_createCols === false) {
286
+					$value=null;
287
+		}
280 288
 		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
281 289
 		return $item;
282 290
 	}
Please login to merge, or discard this patch.
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -32,16 +32,16 @@  discard block
 block discarded – undo
32 32
 			// }
33 33
 			$this->setWide($numCols);
34 34
 		}
35
-		if($createCols)
35
+		if ($createCols)
36 36
 			$this->setRowsCount($numRows, $numCols);
37 37
 	}
38 38
 
39 39
 	public function asSegment() {
40
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
40
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
41 41
 	}
42 42
 
43 43
 	public function asContainer() {
44
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
44
+		return $this->addToPropertyCtrl("class", "container", array("container"));
45 45
 	}
46 46
 
47 47
 	/**
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
 	 * @param int $wide
50 50
 	 */
51 51
 	public function setWide($wide) {
52
-		if(isset(Wide::getConstants()["W" . $wide])){
53
-			$wide=Wide::getConstants()["W" . $wide];
52
+		if (isset(Wide::getConstants()["W".$wide])) {
53
+			$wide=Wide::getConstants()["W".$wide];
54 54
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
55
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
55
+			return $this->addToPropertyCtrl("class", "column", array("column"));
56 56
 		}
57 57
 		return $this;
58 58
 	}
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	 * @return mixed
73 73
 	 */
74 74
 	public function addRow($colsCount=NULL) {
75
-		$rowCount=$this->rowCount() + 1;
75
+		$rowCount=$this->rowCount()+1;
76 76
 		$this->setRowsCount($rowCount, $colsCount, true);
77
-		return $this->content[$rowCount - 1];
77
+		return $this->content[$rowCount-1];
78 78
 	}
79 79
 
80 80
 	/**
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
84 84
 	 */
85 85
 	public function addCol($width=NULL) {
86
-		$colCount=$this->colCount() + 1;
86
+		$colCount=$this->colCount()+1;
87 87
 		$this->setColsCount($colCount, true, $width);
88 88
 		if ($this->hasOnlyCols($this->count()))
89
-			return $this->content[$colCount - 1];
89
+			return $this->content[$colCount-1];
90 90
 		return $this;
91 91
 	}
92 92
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
97 97
 	 */
98 98
 	public function addCols($sizes=array()) {
99
-		foreach ( $sizes as $size ) {
99
+		foreach ($sizes as $size) {
100 100
 			$this->addCol($size);
101 101
 		}
102 102
 		return $this;
@@ -110,19 +110,19 @@  discard block
 block discarded – undo
110 110
 	 */
111 111
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
112 112
 		$count=$this->count();
113
-		if ($rowsCount < 2 && $force === false) {
114
-			for($i=$count; $i < $colsCount; $i++) {
115
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
113
+		if ($rowsCount<2 && $force===false) {
114
+			for ($i=$count; $i<$colsCount; $i++) {
115
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
116 116
 			}
117 117
 		} else {
118 118
 			if ($this->hasOnlyCols($count)) {
119 119
 				$tmpContent=$this->content;
120 120
 				$item=$this->addItem($colsCount);
121 121
 				$item->setContent($tmpContent);
122
-				$this->content=array ();
122
+				$this->content=array();
123 123
 				$count=1;
124 124
 			}
125
-			for($i=$count; $i < $rowsCount; $i++) {
125
+			for ($i=$count; $i<$rowsCount; $i++) {
126 126
 				$this->addItem($colsCount);
127 127
 			}
128 128
 		}
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	}
131 131
 
132 132
 	protected function hasOnlyCols($count) {
133
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
133
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
134 134
 	}
135 135
 
136 136
 	/**
@@ -144,14 +144,14 @@  discard block
 block discarded – undo
144 144
 		if (isset($width)===false) {
145 145
 			$this->setWide($numCols);
146 146
 		}
147
-		if ($toCreate === true) {
147
+		if ($toCreate===true) {
148 148
 			$count=$this->count();
149
-			if ($count == 0 || $this->hasOnlyCols($count)) {
150
-				for($i=$count; $i < $numCols; $i++) {
151
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
149
+			if ($count==0 || $this->hasOnlyCols($count)) {
150
+				for ($i=$count; $i<$numCols; $i++) {
151
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
152 152
 				}
153 153
 			} else {
154
-				for($i=0; $i < $count; $i++) {
154
+				for ($i=0; $i<$count; $i++) {
155 155
 					$this->getItem($i)->setColsCount($numCols);
156 156
 				}
157 157
 			}
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		$count=$this->count();
188 188
 		if ($this->hasOnlyCols($count))
189 189
 			return $count;
190
-		if ($count > 0)
190
+		if ($count>0)
191 191
 			return $this->getItem(0)->count();
192 192
 		return 0;
193 193
 	}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
200 200
 	 */
201 201
 	public function getCell($row, $col) {
202
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
202
+		if ($row<2 && $this->hasOnlyCols($this->count()))
203 203
 			return $this->getItem($col);
204 204
 		$row=$this->getItem($row);
205 205
 		if (isset($row)) {
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
215 215
 	 */
216 216
 	public function setDivided($vertically=false) {
217
-		$value=($vertically === true) ? "vertically divided" : "divided";
218
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
217
+		$value=($vertically===true) ? "vertically divided" : "divided";
218
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
219 219
 	}
220 220
 
221 221
 	/**
@@ -224,15 +224,15 @@  discard block
 block discarded – undo
224 224
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
225 225
 	 */
226 226
 	public function setCelled($internally=false) {
227
-		$value=($internally === true) ? "internally celled" : "celled";
228
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
227
+		$value=($internally===true) ? "internally celled" : "celled";
228
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
229 229
 	}
230 230
 
231 231
 	/**
232 232
 	 * A grid can have its columns centered
233 233
 	 */
234 234
 	public function setCentered() {
235
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
235
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
236 236
 	}
237 237
 
238 238
 	/**
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	 */
251 251
 	public function setPadded($value=NULL) {
252 252
 		if (isset($value))
253
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
253
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
254 254
 		return $this->addToProperty("class", "padded");
255 255
 	}
256 256
 
@@ -260,12 +260,12 @@  discard block
 block discarded – undo
260 260
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
261 261
 	 */
262 262
 	public function setRelaxed($very=false) {
263
-		$value=($very === true) ? "very relaxed" : "relaxed";
264
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
263
+		$value=($very===true) ? "very relaxed" : "relaxed";
264
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
265 265
 	}
266 266
 
267 267
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
268
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
268
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
269 269
 	}
270 270
 
271 271
 	/**
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
275 275
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
276 276
 	 */
277 277
 	protected function createItem($value) {
278
-		if ($this->_createCols === false)
278
+		if ($this->_createCols===false)
279 279
 			$value=null;
280
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
280
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
281 281
 		return $item;
282 282
 	}
283 283
 
@@ -288,20 +288,20 @@  discard block
 block discarded – undo
288 288
 	public function setValues($values, $force=true) {
289 289
 		$count=$this->count();
290 290
 		$valuesSize=\sizeof($values);
291
-		if ($this->_createCols === false || $force === true) {
292
-			for($i=$count; $i < $valuesSize; $i++) {
291
+		if ($this->_createCols===false || $force===true) {
292
+			for ($i=$count; $i<$valuesSize; $i++) {
293 293
 				$colSize=\sizeof($values[$i]);
294
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
294
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
295 295
 			}
296 296
 		}
297
-		$count=\min(array ($this->count(),$valuesSize ));
298
-		for($i=0; $i < $count; $i++) {
299
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
297
+		$count=\min(array($this->count(), $valuesSize));
298
+		for ($i=0; $i<$count; $i++) {
299
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
300 300
 		}
301 301
 	}
302 302
 	
303
-	public function setColWidth($numCol,$width){
304
-		foreach ($this->content as $row){
303
+	public function setColWidth($numCol, $width) {
304
+		foreach ($this->content as $row) {
305 305
 			$row->getCol($numCol)->setWidth($width);
306 306
 		}
307 307
 		return $this;
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,6 +22,9 @@  discard block
 block discarded – undo
22 22
 	private $_colSizing=true;
23 23
 	private $_implicitRows=false;
24 24
 
25
+	/**
26
+	 * @param string $identifier
27
+	 */
25 28
 	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
26 29
 		parent::__construct($identifier, "div", "ui grid");
27 30
 		$this->_implicitRows=$implicitRows;
@@ -162,7 +165,7 @@  discard block
 block discarded – undo
162 165
 	/**
163 166
 	 * return the row at $index
164 167
 	 * @param int $index
165
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
168
+	 * @return \Ajax\common\html\HtmlDoubleElement
166 169
 	 */
167 170
 	public function getRow($index) {
168 171
 		return $this->getItem($index);
Please login to merge, or discard this patch.
Ajax/common/html/HtmlDoubleElement.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 		return $this->content;
28 28
 	}
29 29
 
30
-	public function addContent($content,$before=false) {
30
+	public function addContent($content, $before=false) {
31 31
 		if (!\is_array($this->content)) {
32
-			if(isset($this->content))
33
-				$this->content=array ($this->content);
32
+			if (isset($this->content))
33
+				$this->content=array($this->content);
34 34
 			else
35 35
 				$this->content=array();
36 36
 		}
37
-		if($before)
38
-			array_unshift($this->content,$content);
37
+		if ($before)
38
+			array_unshift($this->content, $content);
39 39
 		else
40 40
 			$this->content []=$content;
41 41
 		return $this;
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 		if ($this->content instanceof HtmlDoubleElement) {
51 51
 			$this->content->run($js);
52 52
 		} else if (\is_array($this->content)) {
53
-			foreach ( $this->content as $itemContent ) {
53
+			foreach ($this->content as $itemContent) {
54 54
 				if ($itemContent instanceof HtmlDoubleElement) {
55 55
 					$itemContent->run($js);
56 56
 				}
@@ -67,19 +67,19 @@  discard block
 block discarded – undo
67 67
 		return $this;
68 68
 	}
69 69
 
70
-	public function getContentInstances($class){
71
-		return $this->_getContentInstances($class,$this->content);
70
+	public function getContentInstances($class) {
71
+		return $this->_getContentInstances($class, $this->content);
72 72
 	}
73 73
 
74
-	protected function _getContentInstances($class,$content){
74
+	protected function _getContentInstances($class, $content) {
75 75
 		$instances=[];
76
-		if($content instanceof $class){
76
+		if ($content instanceof $class) {
77 77
 			$instances[]=$content;
78
-		}elseif($content instanceof HtmlDoubleElement){
79
-			$instances=\array_merge($instances,$content->getContentInstances($class));
80
-		}elseif (\is_array($content)){
81
-			foreach ($content as $element){
82
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
78
+		}elseif ($content instanceof HtmlDoubleElement) {
79
+			$instances=\array_merge($instances, $content->getContentInstances($class));
80
+		}elseif (\is_array($content)) {
81
+			foreach ($content as $element) {
82
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
83 83
 			}
84 84
 		}
85 85
 		return $instances;
Please login to merge, or discard this patch.
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,15 +29,17 @@  discard block
 block discarded – undo
29 29
 
30 30
 	public function addContent($content,$before=false) {
31 31
 		if (!\is_array($this->content)) {
32
-			if(isset($this->content))
33
-				$this->content=array ($this->content);
34
-			else
35
-				$this->content=array();
32
+			if(isset($this->content)) {
33
+							$this->content=array ($this->content);
34
+			} else {
35
+							$this->content=array();
36
+			}
37
+		}
38
+		if($before) {
39
+					array_unshift($this->content,$content);
40
+		} else {
41
+					$this->content []=$content;
36 42
 		}
37
-		if($before)
38
-			array_unshift($this->content,$content);
39
-		else
40
-			$this->content []=$content;
41 43
 		return $this;
42 44
 	}
43 45
 
@@ -75,9 +77,9 @@  discard block
 block discarded – undo
75 77
 		$instances=[];
76 78
 		if($content instanceof $class){
77 79
 			$instances[]=$content;
78
-		}elseif($content instanceof HtmlDoubleElement){
80
+		} elseif($content instanceof HtmlDoubleElement){
79 81
 			$instances=\array_merge($instances,$content->getContentInstances($class));
80
-		}elseif (\is_array($content)){
82
+		} elseif (\is_array($content)){
81 83
 			foreach ($content as $element){
82 84
 				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
83 85
 			}
Please login to merge, or discard this patch.
Ajax/common/html/html5/HtmlInput.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,8 +17,9 @@  discard block
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function setValue($value) {
20
-		if(isset($value))
21
-		$this->setProperty("value", $value);
20
+		if(isset($value)) {
21
+				$this->setProperty("value", $value);
22
+		}
22 23
 		return $this;
23 24
 	}
24 25
 
@@ -27,16 +28,18 @@  discard block
 block discarded – undo
27 28
 	}
28 29
 
29 30
 	public function setPlaceholder($value){
30
-		if(JString::isNotNull($value))
31
-			$this->_placeholder=$value;
31
+		if(JString::isNotNull($value)) {
32
+					$this->_placeholder=$value;
33
+		}
32 34
 		return $this;
33 35
 	}
34 36
 
35 37
 	public function compile(JsUtils $js=NULL,&$view=NULL){
36 38
 		$value=$this->_placeholder;
37 39
 		if(JString::isNull($value)){
38
-			if(JString::isNotNull($this->getProperty("name")))
39
-				$value=\ucfirst($this->getProperty("name"));
40
+			if(JString::isNotNull($this->getProperty("name"))) {
41
+							$value=\ucfirst($this->getProperty("name"));
42
+			}
40 43
 		}
41 44
 		$this->setProperty("placeholder", $value);
42 45
 		return parent::compile($js,$view);
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 class HtmlInput extends HtmlSingleElement {
10 10
 	protected $_placeholder;
11
-	public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) {
11
+	public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) {
12 12
 		parent::__construct($identifier, "input");
13 13
 		$this->setProperty("name", $identifier);
14 14
 		$this->setValue($value);
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function setValue($value) {
20
-		if(isset($value))
20
+		if (isset($value))
21 21
 		$this->setProperty("value", $value);
22 22
 		return $this;
23 23
 	}
@@ -26,19 +26,19 @@  discard block
 block discarded – undo
26 26
 		return $this->setProperty("type", $value);
27 27
 	}
28 28
 
29
-	public function setPlaceholder($value){
30
-		if(JString::isNotNull($value))
29
+	public function setPlaceholder($value) {
30
+		if (JString::isNotNull($value))
31 31
 			$this->_placeholder=$value;
32 32
 		return $this;
33 33
 	}
34 34
 
35
-	public function compile(JsUtils $js=NULL,&$view=NULL){
35
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
36 36
 		$value=$this->_placeholder;
37
-		if(JString::isNull($value)){
38
-			if(JString::isNotNull($this->getProperty("name")))
37
+		if (JString::isNull($value)) {
38
+			if (JString::isNotNull($this->getProperty("name")))
39 39
 				$value=\ucfirst($this->getProperty("name"));
40 40
 		}
41 41
 		$this->setProperty("placeholder", $value);
42
-		return parent::compile($js,$view);
42
+		return parent::compile($js, $view);
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.