Completed
Push — master ( ab9bf6...aac371 )
by Jean-Christophe
03:31
created
Ajax/semantic/html/elements/HtmlInput.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -8,53 +8,53 @@
 block discarded – undo
8 8
 use Ajax\semantic\html\base\constants\Variation;
9 9
 use Ajax\semantic\html\base\traits\IconTrait;
10 10
 
11
-class HtmlInput extends HtmlSemDoubleElement{
11
+class HtmlInput extends HtmlSemDoubleElement {
12 12
 	use IconTrait;
13
-	public function __construct($identifier,$type="text",$value="",$placeholder=""){
14
-		parent::__construct("div-".$identifier,"div","ui input");
15
-		$this->content=new \Ajax\common\html\html5\HtmlInput($identifier,$type,$value,$placeholder);
16
-		$this->_states=[State::DISABLED,State::FOCUS,State::ERROR];
13
+	public function __construct($identifier, $type="text", $value="", $placeholder="") {
14
+		parent::__construct("div-".$identifier, "div", "ui input");
15
+		$this->content=new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder);
16
+		$this->_states=[State::DISABLED, State::FOCUS, State::ERROR];
17 17
 		$this->_variations=[Variation::TRANSPARENT];
18 18
 	}
19 19
 
20
-	public function setFocus(){
20
+	public function setFocus() {
21 21
 		$this->addToProperty("class", State::FOCUS);
22 22
 	}
23 23
 
24
-	public function addLoading(){
25
-		if($this->_hasIcon===false){
24
+	public function addLoading() {
25
+		if ($this->_hasIcon===false) {
26 26
 			throw new \Exception("Input must have an icon for showing a loader, use addIcon before");
27 27
 		}
28 28
 		return $this->addToProperty("class", State::LOADING);
29 29
 	}
30 30
 
31
-	public function addLabel($label,$direction=Direction::LEFT,$icon=NULL){
31
+	public function addLabel($label, $direction=Direction::LEFT, $icon=NULL) {
32 32
 		$labelO=$label;
33
-		if(\is_object($label)===false){
34
-			$labelO=new HtmlLabel("label-".$this->identifier,$label);
35
-			if(isset($icon))
33
+		if (\is_object($label)===false) {
34
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
35
+			if (isset($icon))
36 36
 				$labelO->addIcon($icon);
37
-		}else{
37
+		}else {
38 38
 			$labelO->addToPropertyCtrl("class", "label", array("label"));
39 39
 		}
40 40
 		$this->addToProperty("class", $direction." labeled");
41
-		$this->addContent($labelO,\strstr($direction,Direction::LEFT)!==false);
41
+		$this->addContent($labelO, \strstr($direction, Direction::LEFT)!==false);
42 42
 		return $labelO;
43 43
 	}
44 44
 
45
-	public function addLabelToCorner($label,$direction=Direction::LEFT,$icon=NULL){
46
-		return $this->addLabel($label,$direction." corner",$icon)->toCorner($direction);
45
+	public function addLabelToCorner($label, $direction=Direction::LEFT, $icon=NULL) {
46
+		return $this->addLabel($label, $direction." corner", $icon)->toCorner($direction);
47 47
 	}
48 48
 
49
-	public function addAction($action,$direction=Direction::LEFT,$icon=NULL,$labeled=false){
49
+	public function addAction($action, $direction=Direction::LEFT, $icon=NULL, $labeled=false) {
50 50
 		$actionO=$action;
51
-		if(\is_object($action)===false){
52
-			$actionO=new HtmlButton("action-".$this->identifier,$action);
53
-			if(isset($icon))
54
-				$actionO->addIcon($icon,true,$labeled);
51
+		if (\is_object($action)===false) {
52
+			$actionO=new HtmlButton("action-".$this->identifier, $action);
53
+			if (isset($icon))
54
+				$actionO->addIcon($icon, true, $labeled);
55 55
 		}
56 56
 		$this->addToProperty("class", $direction." action");
57
-		$this->addContent($actionO,\strstr($direction,Direction::LEFT)!==false);
57
+		$this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false);
58 58
 		return $actionO;
59 59
 	}
60 60
 
Please login to merge, or discard this patch.
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,9 +32,10 @@  discard block
 block discarded – undo
32 32
 		$labelO=$label;
33 33
 		if(\is_object($label)===false){
34 34
 			$labelO=new HtmlLabel("label-".$this->identifier,$label);
35
-			if(isset($icon))
36
-				$labelO->addIcon($icon);
37
-		}else{
35
+			if(isset($icon)) {
36
+							$labelO->addIcon($icon);
37
+			}
38
+		} else{
38 39
 			$labelO->addToPropertyCtrl("class", "label", array("label"));
39 40
 		}
40 41
 		$this->addToProperty("class", $direction." labeled");
@@ -50,8 +51,9 @@  discard block
 block discarded – undo
50 51
 		$actionO=$action;
51 52
 		if(\is_object($action)===false){
52 53
 			$actionO=new HtmlButton("action-".$this->identifier,$action);
53
-			if(isset($icon))
54
-				$actionO->addIcon($icon,true,$labeled);
54
+			if(isset($icon)) {
55
+							$actionO->addIcon($icon,true,$labeled);
56
+			}
55 57
 		}
56 58
 		$this->addToProperty("class", $direction." action");
57 59
 		$this->addContent($actionO,\strstr($direction,Direction::LEFT)!==false);
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Emphasis.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,5 +5,5 @@
 block discarded – undo
5 5
 use Ajax\common\BaseEnum;
6 6
 
7 7
 abstract class Emphasis extends BaseEnum {
8
-	const PRIMARY="primary",SECONDARY="secondary",TERTIARY="tertiary";
8
+	const PRIMARY="primary", SECONDARY="secondary", TERTIARY="tertiary";
9 9
 }
10 10
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/HtmlSemNavElement.php 3 patches
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 	protected $_contentSeparator="";
23 23
 
24 24
 
25
-	public function __construct($identifier,$tagName,$baseClass){
26
-		parent::__construct($identifier,$tagName,$baseClass);
25
+	public function __construct($identifier, $tagName, $baseClass) {
26
+		parent::__construct($identifier, $tagName, $baseClass);
27 27
 		$this->root="";
28 28
 		$this->attr="data-ajax";
29 29
 	}
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 	 * @param string $attr the html attribute used to build the elements url
36 36
 	 * @return HtmlNavElement
37 37
 	 */
38
-	public function autoGetOnClick($targetSelector){
39
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
38
+	public function autoGetOnClick($targetSelector) {
39
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
40 40
 	}
41 41
 
42
-	public function contentAsString(){
42
+	public function contentAsString() {
43 43
 		return JArray::implode($this->_contentSeparator, $this->content);
44 44
 	}
45 45
 
@@ -47,15 +47,15 @@  discard block
 block discarded – undo
47 47
 	 * Generate the jquery script to set the elements to the HtmlNavElement
48 48
 	 * @param JsUtils $jsUtils
49 49
 	 */
50
-	public function jsSetContent(JsUtils $jsUtils){
51
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
50
+	public function jsSetContent(JsUtils $jsUtils) {
51
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
52 52
 	}
53 53
 
54 54
 	public function getRoot() {
55 55
 		return $this->root;
56 56
 	}
57 57
 	public function setRoot($root) {
58
-		$this->root = $root;
58
+		$this->root=$root;
59 59
 		return $this;
60 60
 	}
61 61
 	public function getAttr() {
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 	 * @return HtmlNavElement
69 69
 	 */
70 70
 	public function setAttr($attr) {
71
-		$this->attr = $attr;
71
+		$this->attr=$attr;
72 72
 		return $this;
73 73
 	}
74 74
 
75 75
 	public function __call($method, $args) {
76
-		if(isset($this->$method) && is_callable($this->$method)) {
76
+		if (isset($this->$method) && is_callable($this->$method)) {
77 77
 			return call_user_func_array(
78 78
 					$this->$method,
79 79
 					$args
@@ -81,32 +81,32 @@  discard block
 block discarded – undo
81 81
 		}
82 82
 	}
83 83
 
84
-	public abstract function fromDispatcher($dispatcher,$startIndex=0);
84
+	public abstract function fromDispatcher($dispatcher, $startIndex=0);
85 85
 
86 86
 
87
-	public function setContentDivider($divider,$index=NULL) {
87
+	public function setContentDivider($divider, $index=NULL) {
88 88
 		$divider="<div class='divider'> {$divider} </div>";
89 89
 		return $this->setDivider($divider, $index);
90 90
 	}
91 91
 
92
-	public function setIconContentDivider($iconContentDivider,$index=NULL) {
92
+	public function setIconContentDivider($iconContentDivider, $index=NULL) {
93 93
 		$contentDivider="<i class='".$iconContentDivider." icon divider'></i>";
94 94
 		return $this->setDivider($contentDivider, $index);
95 95
 	}
96 96
 
97
-	protected function setDivider($divider,$index){
98
-		if(isset($index)){
99
-			if(\is_array($this->_contentSeparator)===false)
100
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
97
+	protected function setDivider($divider, $index) {
98
+		if (isset($index)) {
99
+			if (\is_array($this->_contentSeparator)===false)
100
+				$this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator);
101 101
 			$this->_contentSeparator[$index]=$divider;
102
-		}else{
102
+		}else {
103 103
 			$this->_contentSeparator=$divider;
104 104
 		}
105 105
 		return $this;
106 106
 	}
107 107
 
108
-	protected function getContentDivider($index){
109
-		if(\is_array($this->_contentSeparator)===true){
108
+	protected function getContentDivider($index) {
109
+		if (\is_array($this->_contentSeparator)===true) {
110 110
 			return @$this->_contentSeparator[$index];
111 111
 		}
112 112
 		return $this->_contentSeparator;
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,10 +96,11 @@
 block discarded – undo
96 96
 
97 97
 	protected function setDivider($divider,$index){
98 98
 		if(isset($index)){
99
-			if(\is_array($this->_contentSeparator)===false)
100
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
99
+			if(\is_array($this->_contentSeparator)===false) {
100
+							$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
101
+			}
101 102
 			$this->_contentSeparator[$index]=$divider;
102
-		}else{
103
+		} else{
103 104
 			$this->_contentSeparator=$divider;
104 105
 		}
105 106
 		return $this;
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,6 +22,11 @@  discard block
 block discarded – undo
22 22
 	protected $_contentSeparator="";
23 23
 
24 24
 
25
+	/**
26
+	 * @param string $identifier
27
+	 * @param string $tagName
28
+	 * @param string $baseClass
29
+	 */
25 30
 	public function __construct($identifier,$tagName,$baseClass){
26 31
 		parent::__construct($identifier,$tagName,$baseClass);
27 32
 		$this->root="";
@@ -31,7 +36,7 @@  discard block
 block discarded – undo
31 36
 	/**
32 37
 	 * Associate an ajax get to the elements, displayed in $targetSelector
33 38
 	 * @param string $targetSelector the target of the get
34
-	 * @return HtmlNavElement
39
+	 * @return HtmlSemNavElement
35 40
 	 */
36 41
 	public function autoGetOnClick($targetSelector){
37 42
 		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
@@ -63,7 +68,7 @@  discard block
 block discarded – undo
63 68
 	/**
64 69
 	 * Define the html attribute for each element url in ajax
65 70
 	 * @param string $attr html attribute
66
-	 * @return HtmlNavElement
71
+	 * @return HtmlSemNavElement
67 72
 	 */
68 73
 	public function setAttr($attr) {
69 74
 		$this->attr = $attr;
@@ -103,6 +108,9 @@  discard block
 block discarded – undo
103 108
 		return $this;
104 109
 	}
105 110
 
111
+	/**
112
+	 * @param integer $index
113
+	 */
106 114
 	protected function getContentDivider($index){
107 115
 		if(\is_array($this->_contentSeparator)===true){
108 116
 			return @$this->_contentSeparator[$index];
Please login to merge, or discard this patch.
Ajax/service/JArray.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,21 +20,21 @@
 block discarded – undo
20 20
 	public static function getDefaultValue($array, $key, $default) {
21 21
 		if (array_key_exists($key, $array)) {
22 22
 			return $array [$key];
23
-		} else
23
+		}else
24 24
 			return $default;
25 25
 	}
26 26
 
27
-	public static function implode($glue,$pieces){
27
+	public static function implode($glue, $pieces) {
28 28
 		$result="";
29
-		if(\is_array($glue)){
29
+		if (\is_array($glue)) {
30 30
 			$size=\sizeof($pieces);
31
-			if($size>0){
32
-				for($i=0;$i<$size-1;$i++){
31
+			if ($size>0) {
32
+				for ($i=0; $i<$size-1; $i++) {
33 33
 					$result.=$pieces[$i].@$glue[$i];
34 34
 				}
35 35
 				$result.=$pieces[$size-1];
36 36
 			}
37
-		}else{
37
+		}else {
38 38
 			$result=\implode($glue, $pieces);
39 39
 		}
40 40
 		return $result;
Please login to merge, or discard this patch.
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,15 +13,17 @@  discard block
 block discarded – undo
13 13
 			return $array [$key];
14 14
 		}
15 15
 		$values=array_values($array);
16
-		if ($pos<sizeof($values))
17
-			return $values [$pos];
16
+		if ($pos<sizeof($values)) {
17
+					return $values [$pos];
18
+		}
18 19
 	}
19 20
 
20 21
 	public static function getDefaultValue($array, $key, $default) {
21 22
 		if (array_key_exists($key, $array)) {
22 23
 			return $array [$key];
23
-		} else
24
-			return $default;
24
+		} else {
25
+					return $default;
26
+		}
25 27
 	}
26 28
 
27 29
 	public static function implode($glue,$pieces){
@@ -34,7 +36,7 @@  discard block
 block discarded – undo
34 36
 				}
35 37
 				$result.=$pieces[$size-1];
36 38
 			}
37
-		}else{
39
+		} else{
38 40
 			$result=\implode($glue, $pieces);
39 41
 		}
40 42
 		return $result;
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/LabeledIconTrait.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,17 +13,17 @@
 block discarded – undo
13 13
 	 * @param boolean $labeled
14 14
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
15 15
 	 */
16
-	public function addIcon($icon,$before=true,$labeled=false){
16
+	public function addIcon($icon, $before=true, $labeled=false) {
17 17
 		$iconO=$icon;
18
-		if(\is_string($icon)){
18
+		if (\is_string($icon)) {
19 19
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
20 20
 		}
21
-		if($labeled!==false){
22
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
21
+		if ($labeled!==false) {
22
+			$direction=($before===true) ? Direction::LEFT : Direction::RIGHT;
23 23
 			$this->addToProperty("class", $direction." labeled icon");
24 24
 			$this->tagName="div";
25 25
 		}
26
-		$this->addContent($iconO,$before);
26
+		$this->addContent($iconO, $before);
27 27
 		return $iconO;
28 28
 	}
29 29
 }
30 30
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Color.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 use Ajax\common\BaseEnum;
6 6
 
7 7
 abstract class Color extends BaseEnum {
8
-	const STANDARD="",RED="red",ORANGE="orange",YELLOW="yellow",
9
-	OLIVE="olive",GREEN="green",TEAL="teal",
10
-	BLUE="blue",VIOLET="violet",PURPLE="purple",
11
-	PINK="pink",BROWN="brown",GREY="grey",BLACK="black";
8
+	const STANDARD="", RED="red", ORANGE="orange", YELLOW="yellow",
9
+	OLIVE="olive", GREEN="green", TEAL="teal",
10
+	BLUE="blue", VIOLET="violet", PURPLE="purple",
11
+	PINK="pink", BROWN="brown", GREY="grey", BLACK="black";
12 12
 }
13 13
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/components/Dropdown.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param string $action one of "select","auto","activate","combo","nothing","hide"
18 18
 	 * @return \Ajax\semantic\components\Dropdown
19 19
 	 */
20
-	public function setAction($action){
21
-		return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide"));
20
+	public function setAction($action) {
21
+		return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide"));
22 22
 	}
23 23
 
24 24
 	/**
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 	 * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event)
27 27
 	 * @return \Ajax\semantic\components\Dropdown
28 28
 	 */
29
-	public function setOn($event){
29
+	public function setOn($event) {
30 30
 		return $this->setParam("on", $event);
31 31
 	}
32 32
 
33
-	public function setFullTextSearch($value){
33
+	public function setFullTextSearch($value) {
34 34
 		return $this->setParam("fullTextSearch", $value);
35 35
 	}
36 36
 }
37 37
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/lib/CDN.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-return array (
3
-		"JQuery" => array (
4
-				"MaxCDN" => array (
2
+return array(
3
+		"JQuery" => array(
4
+				"MaxCDN" => array(
5 5
 						"url" => "http://code.jquery.com/jquery-%version%.min.js",
6
-						"versions" => array (
6
+						"versions" => array(
7 7
 								"2.2.3",
8 8
 								"2.2.1",
9 9
 								"2.1.4",
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 								"1.11.2"
12 12
 						)
13 13
 				),
14
-				"Google" => array (
14
+				"Google" => array(
15 15
 						"url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js",
16
-						"versions" => array (
16
+						"versions" => array(
17 17
 								"2.2.2",
18 18
 								"2.2.1",
19 19
 								"2.2.0",
@@ -25,17 +25,17 @@  discard block
 block discarded – undo
25 25
 						)
26 26
 				)
27 27
 		),
28
-		"JQueryUI" => array (
29
-				"MaxCDN" => array (
28
+		"JQueryUI" => array(
29
+				"MaxCDN" => array(
30 30
 						"core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js",
31 31
 						"css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css",
32
-						"versions" => array (
32
+						"versions" => array(
33 33
 								"1.11.4",
34 34
 								"1.11.3",
35 35
 								"1.11.2",
36 36
 								"1.10.4"
37 37
 						),
38
-						"themes" => array (
38
+						"themes" => array(
39 39
 								"black-tie",
40 40
 								"blitzer",
41 41
 								"cupertino",
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 								"vader"
63 63
 						)
64 64
 				),
65
-				"Google" => array (
65
+				"Google" => array(
66 66
 						"core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js",
67 67
 						"css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css",
68
-						"versions" => array (
68
+						"versions" => array(
69 69
 								"1.11.4",
70 70
 								"1.11.3",
71 71
 								"1.11.2",
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 								"1.10.4",
75 75
 								"1.10.0"
76 76
 						),
77
-						"themes" => array (
77
+						"themes" => array(
78 78
 								"black-tie",
79 79
 								"blitzer",
80 80
 								"cupertino",
@@ -102,25 +102,25 @@  discard block
 block discarded – undo
102 102
 						)
103 103
 				)
104 104
 		),
105
-		"Bootstrap" => array (
106
-				"MaxCDN" => array (
105
+		"Bootstrap" => array(
106
+				"MaxCDN" => array(
107 107
 						"core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js",
108 108
 						"css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css",
109
-						"versions" => array (
109
+						"versions" => array(
110 110
 								"3.3.6",
111 111
 								"3.3.5"
112 112
 						),
113
-						"themes" => array ()
113
+						"themes" => array()
114 114
 				)
115 115
 		),
116
-		"Semantic" => array (
117
-				"cdnjs" => array (
116
+		"Semantic" => array(
117
+				"cdnjs" => array(
118 118
 						"core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js",
119 119
 						"css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js",
120
-						"versions" => array (
120
+						"versions" => array(
121 121
 								"2.1.8"
122 122
 						),
123
-						"themes" => array ()
123
+						"themes" => array()
124 124
 				)
125 125
 		)
126 126
 );
127 127
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/lib/CDNCoreCss.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 	protected $localCss;
10 10
 	protected $framework;
11 11
 
12
-	public function __construct($framework,$version, $provider="MaxCDN") {
12
+	public function __construct($framework, $version, $provider="MaxCDN") {
13 13
 		parent::__construct($version, $provider);
14 14
 		$this->framework=$framework;
15 15
 		$this->data=$this->data [$framework];
Please login to merge, or discard this patch.