Completed
Push — master ( 91bcae...49f42f )
by Jean-Christophe
07:25
created
Ajax/semantic/components/search/SearchCategories.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  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) {
@@ -14,17 +14,17 @@  discard block
 block discarded – undo
14 14
 		if (\array_key_exists($category, $this->categories)) {
15 15
 			$this->categories[$category]->addResults($results);
16 16
 		} else {
17
-			$categoryO=new SearchCategory("category" . $count, $category, $results);
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.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@
 block discarded – undo
24 24
 		$result=array ();
25 25
 		foreach ( $this->categories as $category ) {
26 26
 			$r=$category->search($query, $field);
27
-			if ($r !== false)
28
-				$result[]=$r;
27
+			if ($r !== false) {
28
+							$result[]=$r;
29
+			}
29 30
 		}
30 31
 		$this->categories=$result;
31 32
 		return $this;
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.
Ajax/semantic/components/search/SearchResults.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 	private $elements;
9 9
 
10 10
 	public function __construct($objects=NULL) {
11
-		$this->elements=array ();
11
+		$this->elements=array();
12 12
 		if (isset($objects)) {
13 13
 			if (\is_array($objects)) {
14 14
 				$this->addResults($objects);
@@ -23,20 +23,20 @@  discard block
 block discarded – undo
23 23
 			$this->elements[]=$object;
24 24
 			return $this;
25 25
 		}
26
-		if (\is_array($object) === false) {
27
-			$object=[ "title" => $object ];
26
+		if (\is_array($object)===false) {
27
+			$object=["title" => $object];
28 28
 		}
29 29
 		$this->elements[]=new SearchResult($object);
30 30
 		return $this;
31 31
 	}
32 32
 
33 33
 	public function addResults($objects) {
34
-		if (\is_array($objects) === false) {
34
+		if (\is_array($objects)===false) {
35 35
 			return $this->addResult($objects);
36 36
 		}
37
-		if (JArray::dimension($objects) === 1) {
38
-			foreach ( $objects as $object ) {
39
-				$this->addResult([ "title" => $object ]);
37
+		if (JArray::dimension($objects)===1) {
38
+			foreach ($objects as $object) {
39
+				$this->addResult(["title" => $object]);
40 40
 			}
41 41
 		} else
42 42
 			$this->elements=\array_merge($this->elements, $objects);
@@ -44,21 +44,21 @@  discard block
 block discarded – undo
44 44
 	}
45 45
 
46 46
 	public function _search($query, $field="title") {
47
-		$result=array ();
48
-		foreach ( $this->elements as $element ) {
47
+		$result=array();
48
+		foreach ($this->elements as $element) {
49 49
 			if ($element instanceof SearchResult) {
50
-				if ($element->search($query, $field) !== false)
50
+				if ($element->search($query, $field)!==false)
51 51
 					$result[]=$element->asArray();
52 52
 			} else {
53 53
 				if (\array_key_exists($field, $element)) {
54 54
 					$value=$element[$field];
55
-					if (\stripos($value, $query) !== false) {
55
+					if (\stripos($value, $query)!==false) {
56 56
 						$result[]=$element;
57 57
 					}
58 58
 				}
59 59
 			}
60 60
 		}
61
-		if (\sizeof($result) > 0) {
61
+		if (\sizeof($result)>0) {
62 62
 			return $result;
63 63
 		}
64 64
 		return false;
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
 
67 67
 	public function search($query, $field="title") {
68 68
 		$result=$this->_search($query, $field);
69
-		if ($result === false)
69
+		if ($result===false)
70 70
 			$result=NULL;
71 71
 		return new SearchResults($result);
72 72
 	}
73 73
 
74 74
 	public function __toString() {
75
-		$result="\"results\": " . \json_encode($this->elements);
75
+		$result="\"results\": ".\json_encode($this->elements);
76 76
 		return $result;
77 77
 	}
78 78
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	}
82 82
 
83 83
 	public function getResponse() {
84
-		return "{" . $this . "}";
84
+		return "{".$this."}";
85 85
 	}
86 86
 
87 87
 	/**
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,8 +38,9 @@  discard block
 block discarded – undo
38 38
 			foreach ( $objects as $object ) {
39 39
 				$this->addResult([ "title" => $object ]);
40 40
 			}
41
-		} else
42
-			$this->elements=\array_merge($this->elements, $objects);
41
+		} else {
42
+					$this->elements=\array_merge($this->elements, $objects);
43
+		}
43 44
 		return $this;
44 45
 	}
45 46
 
@@ -47,8 +48,9 @@  discard block
 block discarded – undo
47 48
 		$result=array ();
48 49
 		foreach ( $this->elements as $element ) {
49 50
 			if ($element instanceof SearchResult) {
50
-				if ($element->search($query, $field) !== false)
51
-					$result[]=$element->asArray();
51
+				if ($element->search($query, $field) !== false) {
52
+									$result[]=$element->asArray();
53
+				}
52 54
 			} else {
53 55
 				if (\array_key_exists($field, $element)) {
54 56
 					$value=$element[$field];
@@ -66,8 +68,9 @@  discard block
 block discarded – undo
66 68
 
67 69
 	public function search($query, $field="title") {
68 70
 		$result=$this->_search($query, $field);
69
-		if ($result === false)
70
-			$result=NULL;
71
+		if ($result === false) {
72
+					$result=NULL;
73
+		}
71 74
 		return new SearchResults($result);
72 75
 	}
73 76
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormFields.php 4 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		}
36 36
 		if (isset($label))
37 37
 			$this->setLabel($label);
38
-		foreach ( $fields as $field ) {
38
+		foreach ($fields as $field) {
39 39
 			$this->addItem($field);
40 40
 		}
41 41
 		return $this;
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
 	}
97 97
 
98 98
 	public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) {
99
-		$fields=array ();
99
+		$fields=array();
100 100
 		$i=0;
101
-		foreach ( $items as $val => $caption ) {
101
+		foreach ($items as $val => $caption) {
102 102
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
103 103
 			if ($val===$value) {
104 104
 				$itemO->getField()->getField()->setProperty("checked", "");
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 	}
113 113
 
114 114
 	public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
115
-		$fields=array ();
115
+		$fields=array();
116 116
 		$i=0;
117
-		foreach ( $items as $val => $caption ) {
117
+		foreach ($items as $val => $caption) {
118 118
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
119 119
 			if (\array_search($val, $values)!==false) {
120 120
 				$itemO->getField()->getField()->setProperty("checked", "");
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,12 +29,14 @@  discard block
 block discarded – undo
29 29
 				if (\is_string($end)) {
30 30
 					$label=$end;
31 31
 					\array_pop($fields);
32
-				} else
33
-					$label=NULL;
32
+				} else {
33
+									$label=NULL;
34
+				}
34 35
 			}
35 36
 		}
36
-		if (isset($label))
37
-			$this->setLabel($label);
37
+		if (isset($label)) {
38
+					$this->setLabel($label);
39
+		}
38 40
 		foreach ( $fields as $field ) {
39 41
 			$this->addItem($field);
40 42
 		}
@@ -65,8 +67,9 @@  discard block
 block discarded – undo
65 67
 		if ($this->_equalWidth) {
66 68
 			$count=$this->count();
67 69
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
68
-		} else
69
-			$this->addToProperty("class", "fields");
70
+		} else {
71
+					$this->addToProperty("class", "fields");
72
+		}
70 73
 		return parent::compile($js, $view);
71 74
 	}
72 75
 
@@ -106,8 +109,9 @@  discard block
 block discarded – undo
106 109
 			$fields[]=$itemO;
107 110
 		}
108 111
 		$radios=new HtmlFormFields("fields-".$name, $fields);
109
-		if (isset($label))
110
-			$radios->setLabel($label)->setProperty("for", $name);
112
+		if (isset($label)) {
113
+					$radios->setLabel($label)->setProperty("for", $name);
114
+		}
111 115
 		return $radios;
112 116
 	}
113 117
 
@@ -122,8 +126,9 @@  discard block
 block discarded – undo
122 126
 			$fields[]=$itemO;
123 127
 		}
124 128
 		$radios=new HtmlFormFields("fields-".$name, $fields);
125
-		if (isset($label))
126
-			$radios->setLabel($label)->setProperty("for", $name);
129
+		if (isset($label)) {
130
+					$radios->setLabel($label)->setProperty("for", $name);
131
+		}
127 132
 		return $radios;
128 133
 	}
129 134
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -13,6 +13,9 @@
 block discarded – undo
13 13
  */
14 14
 class HtmlIconGroups extends HtmlSemCollection {
15 15
 
16
+	/**
17
+	 * @param string $identifier
18
+	 */
16 19
 	public function __construct($identifier, $icons=array(), $size="") {
17 20
 		parent::__construct($identifier, "i", "icons");
18 21
 		$this->addItems($icons);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
6 6
 use Ajax\JsUtils;
7 7
 use Ajax\service\JArray;
8
-
9 8
 use Ajax\semantic\html\base\constants\State;
10 9
 
11 10
 class HtmlProgress extends HtmlSemDoubleElement {
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FieldsTrait.php 2 patches
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -9,26 +9,26 @@  discard block
 block discarded – undo
9 9
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
10 10
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
11 11
 trait FieldsTrait {
12
-	public abstract function addFields($fields=NULL,$label=NULL);
12
+	public abstract function addFields($fields=NULL, $label=NULL);
13 13
 	public abstract function addItem($item);
14 14
 
15
-	protected function createItem($value){
16
-		if(\is_array($value)){
17
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
15
+	protected function createItem($value) {
16
+		if (\is_array($value)) {
17
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
18 18
 			return $itemO;
19
-		}else
19
+		} else
20 20
 			return new HtmlFormInput($value);
21 21
 	}
22 22
 
23
-	public function addInputs($inputs,$fieldslabel=null){
23
+	public function addInputs($inputs, $fieldslabel=null) {
24 24
 		$fields=array();
25
-		foreach ($inputs as $input){
25
+		foreach ($inputs as $input) {
26 26
 			\extract($input);
27
-			$f=new HtmlFormInput("","");
27
+			$f=new HtmlFormInput("", "");
28 28
 			$f->fromArray($input);
29 29
 			$fields[]=$f;
30 30
 		}
31
-		return $this->addFields($fields,$fieldslabel);
31
+		return $this->addFields($fields, $fieldslabel);
32 32
 	}
33 33
 
34 34
 	/**
@@ -39,27 +39,27 @@  discard block
 block discarded – undo
39 39
 	 * @param boolean $multiple
40 40
 	 * @return \Ajax\common\html\HtmlDoubleElement
41 41
 	 */
42
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
43
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
42
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
43
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
44 44
 	}
45 45
 
46
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
47
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
46
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
47
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
48 48
 	}
49 49
 
50
-	public function addPassword($identifier, $label=NULL){
51
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
50
+	public function addPassword($identifier, $label=NULL) {
51
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
52 52
 	}
53 53
 
54
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
55
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
54
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
55
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
56 56
 	}
57 57
 
58
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
59
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
58
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
59
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
60 60
 	}
61 61
 
62
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
63
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
62
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
63
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
64 64
 	}
65 65
 }
66 66
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@
 block discarded – undo
16 16
 		if(\is_array($value)){
17 17
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
18 18
 			return $itemO;
19
-		}else
20
-			return new HtmlFormInput($value);
19
+		} else {
20
+					return new HtmlFormInput($value);
21
+		}
21 22
 	}
22 23
 
23 24
 	public function addInputs($inputs,$fieldslabel=null){
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@
 block discarded – undo
5 5
 trait TextFieldsTrait {
6 6
 
7 7
 	public abstract function getField();
8
-	public function setPlaceholder($value){
8
+	public function setPlaceholder($value) {
9 9
 		return $this->getField()->setPlaceholder($value);
10 10
 	}
11 11
 
12
-	public function setValue($value){
12
+	public function setValue($value) {
13 13
 		return $this->getField()->setValue($value);
14 14
 	}
15 15
 }
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@
 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 setReadonly(){
17
+	public function setReadonly() {
18 18
 		$this->getField()->setProperty("readonly", "");
19 19
 	}
20 20
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,9 @@
 block discarded – undo
9 9
 	use TextFieldsTrait;
10 10
 
11 11
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
13
-			$placeholder=$label;
12
+		if(!isset($placeholder) && $type==="text") {
13
+					$placeholder=$label;
14
+		}
14 15
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
15 16
 	}
16 17
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormCheckbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 class HtmlFormCheckbox extends HtmlFormField {
16 16
 	use CheckboxTrait;
17 17
 	public function __construct($identifier, $label=NULL, $value=NULL, $type=NULL) {
18
-		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier,$label,$value,$type));
18
+		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier, $label, $value, $type));
19 19
 	}
20 20
 
21 21
 	public static function slider($identifier, $label="", $value=NULL) {
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,17 +9,17 @@
 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
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@
 block discarded – undo
10 10
 	use TextFieldsTrait;
11 11
 
12 12
 	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
14
-			$placeholder=$label;
13
+		if(!isset($placeholder)) {
14
+					$placeholder=$label;
15
+		}
15 16
 		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
16 17
 	}
17 18
 
Please login to merge, or discard this patch.