Completed
Push — master ( eb7f5d...c7a943 )
by Jean-Christophe
03:07
created
Ajax/semantic/html/base/traits/AttachedTrait.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -7,6 +7,11 @@
 block discarded – undo
7 7
 use Ajax\common\html\HtmlDoubleElement;
8 8
 
9 9
 trait AttachedTrait {
10
+
11
+	/**
12
+	 * @param string $name
13
+	 * @param string $value
14
+	 */
10 15
 	abstract public function addToPropertyCtrl($name, $value, $typeCtrl);
11 16
 	/**
12 17
 	 * @param HtmlSemDoubleElement $toElement
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,6 +17,6 @@
 block discarded – undo
17 17
 		if (isset($toElement) && \method_exists($toElement, "setAttached")) {
18 18
 			$toElement->setAttached(true);
19 19
 		}
20
-		return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached"));
20
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
21 21
 	}
22 22
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/base/constants/Social.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,5 +2,5 @@
 block discarded – undo
2 2
 namespace Ajax\semantic\html\base\constants;
3 3
 	use Ajax\common\BaseEnum;
4 4
 abstract class Social extends BaseEnum {
5
-	const FACEBOOK="facebook", TWITTER="twitter",GOOGLEPLUS="google plus",VK="vk",LINKEDIN="linkedin",INSTAGRAM="instagram",YOUTUBE="youtube",GITHUB="github";
5
+	const FACEBOOK="facebook", TWITTER="twitter", GOOGLEPLUS="google plus", VK="vk", LINKEDIN="linkedin", INSTAGRAM="instagram", YOUTUBE="youtube", GITHUB="github";
6 6
 }
Please login to merge, or discard this patch.
Ajax/semantic/components/Popup.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 	 * @return $this
28 28
 	 */
29 29
 	public function setOnShow($jsCode) {
30
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
30
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
31 31
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
32 32
 	}
33 33
 
34
-	public function setExclusive($value){
34
+	public function setExclusive($value) {
35 35
 		return $this->setParam("exclusive", $value);
36 36
 	}
37 37
 
@@ -40,19 +40,19 @@  discard block
 block discarded – undo
40 40
 	 * @param string $popup the css selector of the popup
41 41
 	 * @return \Ajax\semantic\components\Popup
42 42
 	 */
43
-	public function setPopup($popup){
43
+	public function setPopup($popup) {
44 44
 		return $this->setParam("popup", $popup);
45 45
 	}
46 46
 
47
-	public function setInline($value){
47
+	public function setInline($value) {
48 48
 		return $this->setParam("inline", $value);
49 49
 	}
50 50
 
51
-	public function setPosition($value){
51
+	public function setPosition($value) {
52 52
 		return $this->setParam("position", $value);
53 53
 	}
54 54
 
55
-	public function setSetFluidWidth($value){
55
+	public function setSetFluidWidth($value) {
56 56
 		return $this->setParam("setFluidWidth", $value);
57 57
 	}
58 58
 }
Please login to merge, or discard this patch.
Ajax/semantic/traits/SemanticWidgetsTrait.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 	 * @param array $instances
19 19
 	 * @return DataTable
20 20
 	 */
21
-	public function dataTable($identifier,$model, $instances){
22
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
21
+	public function dataTable($identifier, $model, $instances) {
22
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
23 23
 	}
24 24
 
25 25
 	/**
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 	 * @param array $instances
29 29
 	 * @return JsonDataTable
30 30
 	 */
31
-	public function jsonDataTable($identifier,$model, $instances){
32
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
31
+	public function jsonDataTable($identifier, $model, $instances) {
32
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
33 33
 	}
34 34
 
35 35
 	/**
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 	 * @param object $instance
38 38
 	 * @return DataElement
39 39
 	 */
40
-	public function dataElement($identifier, $instance){
41
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
40
+	public function dataElement($identifier, $instance) {
41
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
42 42
 	}
43 43
 
44 44
 	/**
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 	 * @param object $instance
47 47
 	 * @return DataForm
48 48
 	 */
49
-	public function dataForm($identifier, $instance){
50
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
49
+	public function dataForm($identifier, $instance) {
50
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
51 51
 	}
52 52
 
53 53
 	/**
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 * @param object $instance
56 56
 	 * @return FormLogin
57 57
 	 */
58
-	public function defaultLogin($identifier,$instance=null){
59
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
58
+	public function defaultLogin($identifier, $instance=null) {
59
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
60 60
 	}
61 61
 
62 62
 	/**
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 	 * @param object $instance
65 65
 	 * @return FormLogin
66 66
 	 */
67
-	public function smallLogin($identifier,$instance=null){
68
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
67
+	public function smallLogin($identifier, $instance=null) {
68
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
69 69
 	}
70 70
 
71 71
 	/**
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 	 * @param object $instance
74 74
 	 * @return FormLogin
75 75
 	 */
76
-	public function segmentedLogin($identifier,$instance=null){
77
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
76
+	public function segmentedLogin($identifier, $instance=null) {
77
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
78 78
 	}
79 79
 
80 80
 	/**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	 * @param object $instance
83 83
 	 * @return FormAccount
84 84
 	 */
85
-	public function defaultAccount($identifier,$instance=null){
86
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
85
+	public function defaultAccount($identifier, $instance=null) {
86
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
87 87
 	}
88 88
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormDropdown.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,26 +7,26 @@
 block discarded – undo
7 7
 
8 8
 class HtmlFormDropdown extends HtmlFormField {
9 9
 
10
-	public function __construct($identifier,$items=array(), $label=NULL,$value="",$multiple=false,$associative=true) {
11
-		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label);
10
+	public function __construct($identifier, $items=array(), $label=NULL, $value="", $multiple=false, $associative=true) {
11
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
12 12
 		$this->_identifier=$identifier;
13 13
 	}
14 14
 
15
-	public function setItems($items){
15
+	public function setItems($items) {
16 16
 		return $this->getField()->setItems($items);
17 17
 	}
18
-	public function addItem($item,$value=NULL,$image=NULL){
19
-		return $this->getField()->addItem($item,$value,$image);
18
+	public function addItem($item, $value=NULL, $image=NULL) {
19
+		return $this->getField()->addItem($item, $value, $image);
20 20
 	}
21
-	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value="",$associative=true){
22
-		return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative);
21
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) {
22
+		return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative);
23 23
 	}
24 24
 
25
-	public function getDataField(){
25
+	public function getDataField() {
26 26
 		return $this->getField()->getInput();
27 27
 	}
28
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
29
-		$this->getField()->asSelect($name,$multiple,$selection);
28
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
29
+		$this->getField()->asSelect($name, $multiple, $selection);
30 30
 		return $this;
31 31
 	}
32 32
 }
Please login to merge, or discard this patch.
Ajax/semantic/widgets/business/user/FormAccount.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -10,61 +10,61 @@
 block discarded – undo
10 10
 	 * @param string $identifier
11 11
 	 * @param object $modelInstance
12 12
 	 */
13
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
14
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
13
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
14
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
15 15
 	}
16 16
 
17
-	protected function getDefaultModelInstance(){
17
+	protected function getDefaultModelInstance() {
18 18
 		return new UserModel();
19 19
 	}
20 20
 
21
-	public static function regular($identifier,$modelInstance=null){
22
-		return new FormAccount($identifier,$modelInstance,
23
-				["message","login","password","passwordConf","email","submit","error"],
21
+	public static function regular($identifier, $modelInstance=null) {
22
+		return new FormAccount($identifier, $modelInstance,
23
+				["message", "login", "password", "passwordConf", "email", "submit", "error"],
24 24
 				["message"=>[["icon"=>"sign in"]],
25 25
 						"input0"=>[["rules"=>"empty"]],
26
-						"input1"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty']]],
27
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
26
+						"input1"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty']]],
27
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
28 28
 						"input3"=>[["rules"=>"email"]],
29 29
 						"submit"=>["green fluid"],
30 30
 						"message2"=>[["error"=>true]]],
31
-				["Account","login","password","passwordConf","email","submit","error"],
32
-				["Please enter your account informations","Login","Password","Password confirmation","Email address","Creation"],
33
-				[0,1,3,4,5,6]);
31
+				["Account", "login", "password", "passwordConf", "email", "submit", "error"],
32
+				["Please enter your account informations", "Login", "Password", "Password confirmation", "Email address", "Creation"],
33
+				[0, 1, 3, 4, 5, 6]);
34 34
 	}
35 35
 
36
-	public static function smallInline($identifier,$modelInstance=null){
37
-		$result=new FormAccount($identifier,$modelInstance,
38
-				["login","password","submit"],
39
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
40
-				["login","password","submit"],
41
-				["","","Connection"],
36
+	public static function smallInline($identifier, $modelInstance=null) {
37
+		$result=new FormAccount($identifier, $modelInstance,
38
+				["login", "password", "submit"],
39
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
40
+				["login", "password", "submit"],
41
+				["", "", "Connection"],
42 42
 				[2]);
43 43
 			$result->addDividerBefore(0, "Connection");
44 44
 		return $result;
45 45
 	}
46 46
 
47
-	public static function small($identifier,$modelInstance=null){
48
-		$result=new FormAccount($identifier,$modelInstance,
49
-				["login","password","passwordConf","email","submit"],
47
+	public static function small($identifier, $modelInstance=null) {
48
+		$result=new FormAccount($identifier, $modelInstance,
49
+				["login", "password", "passwordConf", "email", "submit"],
50 50
 				[
51 51
 						"input0"=>[["rules"=>"empty"]],
52
-						"input1"=>[["inputType"=>"password","rules"=>['minLength[6]', 'empty']]],
53
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
52
+						"input1"=>[["inputType"=>"password", "rules"=>['minLength[6]', 'empty']]],
53
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
54 54
 						"input3"=>[["rules"=>"email"]],
55 55
 						"submit"=>["green basic"]],
56
-				["login","password","passwordConf","email","submit"],
57
-				["Login","Password","Password confirmation","Email address","Creation"],
58
-				[1,2]);
56
+				["login", "password", "passwordConf", "email", "submit"],
57
+				["Login", "Password", "Password confirmation", "Email address", "Creation"],
58
+				[1, 2]);
59 59
 		$result->addDividerBefore(0, "Creation");
60 60
 		return $result;
61 61
 	}
62 62
 
63
-	public static function attachedSegment($identifier,$modelInstance=null){
64
-		$result=self::regular($identifier,$modelInstance);
65
-		$result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]);
66
-		$result->addWrapper("message",null,"<div class='ui attached segment'>");
67
-		$result->addWrapper("error", null,"</div>");
63
+	public static function attachedSegment($identifier, $modelInstance=null) {
64
+		$result=self::regular($identifier, $modelInstance);
65
+		$result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]);
66
+		$result->addWrapper("message", null, "<div class='ui attached segment'>");
67
+		$result->addWrapper("error", null, "</div>");
68 68
 		return $result;
69 69
 	}
70 70
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/LabeledIconTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 trait LabeledIconTrait {
14 14
 
15 15
 	abstract public function addToProperty($name, $value, $separator=" ");
16
-	abstract public function addContent($content,$before=false);
16
+	abstract public function addContent($content, $before=false);
17 17
 
18 18
 	/**
19 19
 	 * Adds an icon before or after
@@ -22,17 +22,17 @@  discard block
 block discarded – undo
22 22
 	 * @param boolean $labeled
23 23
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
24 24
 	 */
25
-	public function addIcon($icon,$before=true,$labeled=false){
25
+	public function addIcon($icon, $before=true, $labeled=false) {
26 26
 		$iconO=$icon;
27
-		if(\is_string($icon)){
27
+		if (\is_string($icon)) {
28 28
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
29 29
 		}
30
-		if($labeled!==false){
31
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
30
+		if ($labeled!==false) {
31
+			$direction=($before===true) ?Direction::LEFT : Direction::RIGHT;
32 32
 			$this->addToProperty("class", $direction." labeled icon");
33 33
 			$this->tagName="div";
34 34
 		}
35
-		$this->addContent($iconO,$before);
35
+		$this->addContent($iconO, $before);
36 36
 		return $iconO;
37 37
 	}
38 38
 }
Please login to merge, or discard this patch.
Ajax/semantic/components/Modal.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@
 block discarded – undo
16 16
 		return $this;
17 17
 	}
18 18
 
19
-	public function showDimmer(){
19
+	public function showDimmer() {
20 20
 		return $this->setBehavior("hide dimmer");
21 21
 	}
22 22
 
23
-	public function setInverted(){
23
+	public function setInverted() {
24 24
 		$this->params["inverted"]=true;
25 25
 	}
26 26
 
27 27
 	public function setOnHidden($jsCode) {
28
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
28
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
29 29
 		return $this->setParam("onHidden", "%function(){".$jsCode."}%");
30 30
 	}
31 31
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/content/table/HtmlTD.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 use Ajax\JsUtils;
13 13
 
14 14
 class HtmlTD extends HtmlSemDoubleElement {
15
-	use TextAlignmentTrait,TableElementTrait;
15
+	use TextAlignmentTrait, TableElementTrait;
16 16
 	private $_container;
17 17
 	private $_row;
18 18
 	private $_col;
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 	 */
29 29
 	public function __construct($identifier, $content=NULL, $tagName="td") {
30 30
 		parent::__construct($identifier, $tagName, "", $content);
31
-		$this->_variations=[ Variation::COLLAPSING ];
32
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
31
+		$this->_variations=[Variation::COLLAPSING];
32
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
33 33
 	}
34 34
 
35 35
 	public function setContainer($container, $row, $col) {
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	public function setRowspan($rowspan) {
52
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
53
-		for($i=$to; $i > $this->_row; $i--) {
52
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
53
+		for ($i=$to; $i>$this->_row; $i--) {
54 54
 			$this->_container->toDelete($i, $this->_col);
55 55
 		}
56 56
 		$this->setProperty("rowspan", $rowspan);
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	}
59 59
 
60 60
 	public function mergeRow() {
61
-		if(!$this->_rowMerged){
61
+		if (!$this->_rowMerged) {
62 62
 			$this->_rowMerged=true;
63 63
 			return $this->setRowspan($this->_container->count());
64 64
 		}
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public function mergeCol() {
69
-		if(!$this->_colMerged){
69
+		if (!$this->_colMerged) {
70 70
 			$this->_colMerged=true;
71 71
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
72 72
 		}
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	}
75 75
 
76 76
 	public function setColspan($colspan) {
77
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
78
-		for($i=$to; $i > $this->_col; $i--) {
79
-			$this->_container->toDelete($this->_row, $this->_col + 1);
77
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
78
+		for ($i=$to; $i>$this->_col; $i--) {
79
+			$this->_container->toDelete($this->_row, $this->_col+1);
80 80
 		}
81 81
 		$this->setProperty("colspan", $colspan);
82 82
 		return $this->_container;
@@ -115,21 +115,21 @@  discard block
 block discarded – undo
115 115
 		return $this->addToProperty("class", "selectable");
116 116
 	}
117 117
 
118
-	public function setWidth($width){
118
+	public function setWidth($width) {
119 119
 		if (\is_int($width)) {
120
-			$width=Wide::getConstants()["W" . $width];
120
+			$width=Wide::getConstants()["W".$width];
121 121
 		}
122 122
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
123
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
123
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
124 124
 	}
125 125
 
126
-	public function toDelete(){
126
+	public function toDelete() {
127 127
 		$this->_deleted=true;
128 128
 		return $this;
129 129
 	}
130 130
 
131 131
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
132
-		if(!$this->_deleted)
132
+		if (!$this->_deleted)
133 133
 			return parent::compile();
134 134
 		return;
135 135
 	}
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -84,15 +84,17 @@  discard block
 block discarded – undo
84 84
 
85 85
 	public function getColspan() {
86 86
 		$colspan=1;
87
-		if (\array_key_exists("colspan", $this->properties))
88
-			$colspan=$this->getProperty("colspan");
87
+		if (\array_key_exists("colspan", $this->properties)) {
88
+					$colspan=$this->getProperty("colspan");
89
+		}
89 90
 		return $colspan;
90 91
 	}
91 92
 
92 93
 	public function getRowspan() {
93 94
 		$rowspan=1;
94
-		if (\array_key_exists("rowspan", $this->properties))
95
-			$rowspan=$this->getProperty("rowspan");
95
+		if (\array_key_exists("rowspan", $this->properties)) {
96
+					$rowspan=$this->getProperty("rowspan");
97
+		}
96 98
 		return $rowspan;
97 99
 	}
98 100
 
@@ -129,8 +131,9 @@  discard block
 block discarded – undo
129 131
 	}
130 132
 
131 133
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
132
-		if(!$this->_deleted)
133
-			return parent::compile();
134
+		if(!$this->_deleted) {
135
+					return parent::compile();
136
+		}
134 137
 		return;
135 138
 	}
136 139
 }
Please login to merge, or discard this patch.