Inspection of "add wrapWith in HtmlDoubleElement" - phpMv/phpMv-UI - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 75b4ea...e63bba )

by Jean-Christophe

created 2021-03-27 14:41 UTC

Status

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -13,19 +13,19 @@  discard block
 block discarded – undo
 	 */
 	protected $content;
 
-	protected $wrapContentBefore = "";
+	protected $wrapContentBefore="";
 
-	protected $wrapContentAfter = "";
+	protected $wrapContentAfter="";
 
 	protected $_editableContent;
 
-	public function __construct($identifier, $tagName = "p") {
+	public function __construct($identifier, $tagName="p") {
 		parent::__construct($identifier, $tagName);
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 	}
 
 	public function setContent($content) {
-		$this->content = $content;
+		$this->content=$content;
 		return $this;
 	}
 
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
 		return $this->content;
 	}
 
-	public function addContent($content, $before = false) {
-		if (! \is_array($this->content)) {
+	public function addContent($content, $before=false) {
+		if (!\is_array($this->content)) {
 			if (isset($this->content))
-				$this->content = array(
+				$this->content=array(
 					$this->content
 				);
 			else
-				$this->content = array();
+				$this->content=array();
 		}
 		if ($before)
 			array_unshift($this->content, $content);
 		else
-			$this->content[] = $content;
+			$this->content[]=$content;
 		return $this;
 	}
 
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
 
 	public function setValue($value) {}
 
-	public function wrapContent($before, $after = "") {
-		$this->wrapContentBefore .= $before;
-		$this->wrapContentAfter = $after . $this->wrapContentAfter;
+	public function wrapContent($before, $after="") {
+		$this->wrapContentBefore.=$before;
+		$this->wrapContentAfter=$after.$this->wrapContentAfter;
 		return $this;
 	}
 
@@ -89,14 +89,14 @@  discard block
 block discarded – undo
 	}
 
 	protected function _getContentInstances($class, $content) {
-		$instances = [];
+		$instances=[];
 		if ($content instanceof $class) {
-			$instances[] = $content;
+			$instances[]=$content;
 		} elseif ($content instanceof HtmlDoubleElement) {
-			$instances = \array_merge($instances, $content->getContentInstances($class));
+			$instances=\array_merge($instances, $content->getContentInstances($class));
 		} elseif (\is_array($content)) {
 			foreach ($content as $element) {
-				$instances = \array_merge($instances, $this->_getContentInstances($class, $element));
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -122,28 +122,28 @@  discard block
 block discarded – undo
 		return strip_tags($this->content);
 	}
 
-	public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") {
-		$idF = $field->getIdentifier();
-		$idE = $idF;
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
+		$idF=$field->getIdentifier();
+		$idE=$idF;
 		if ($asForm) {
-			$frm = new HtmlForm("frm-" . $field->getIdentifier());
+			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
-			$fields = $frm->addFields();
-			$idE = $frm->getIdentifier();
+			$fields=$frm->addFields();
+			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');");
-			$this->_editableContent = $frm;
-			$keypress = "";
-			$focusOut = "";
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
+			$this->_editableContent=$frm;
+			$keypress="";
+			$focusOut="";
 		} else {
-			$focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');";
-			$this->_editableContent = $field;
-			$keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});";
+			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
+			$this->_editableContent=$field;
+			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
 		}
 		$this->_editableContent->setProperty("style", "display:none;");
-		$this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});");
-		$this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();");
+		$this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});");
+		$this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();");
 	}
 
 	/**
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled && isset($this->_editableContent)) {
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
 			$this->wrap("", $this->_editableContent);
 		}
 		parent::compile_once($js, $view);

Please login to merge, or discard this patch.

		@@ -13,19 +13,19 @@ discard block
		block discarded – undo
13	13	*/
14	14	protected $content;
15	15
16		- protected $wrapContentBefore = "";
	16	+ protected $wrapContentBefore="";
17	17
18		- protected $wrapContentAfter = "";
	18	+ protected $wrapContentAfter="";
19	19
20	20	protected $_editableContent;
21	21
22		- public function __construct($identifier, $tagName = "p") {
	22	+ public function __construct($identifier, $tagName="p") {
23	23	parent::__construct($identifier, $tagName);
24		- $this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
	24	+ $this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
25	25	}
26	26
27	27	public function setContent($content) {
28		- $this->content = $content;
	28	+ $this->content=$content;
29	29	return $this;
30	30	}
31	31
		@@ -33,19 +33,19 @@ discard block
		block discarded – undo
33	33	return $this->content;
34	34	}
35	35
36		- public function addContent($content, $before = false) {
37		- if (! \is_array($this->content)) {
	36	+ public function addContent($content, $before=false) {
	37	+ if (!\is_array($this->content)) {
38	38	if (isset($this->content))
39		- $this->content = array(
	39	+ $this->content=array(
40	40	$this->content
41	41	);
42	42	else
43		- $this->content = array();
	43	+ $this->content=array();
44	44	}
45	45	if ($before)
46	46	array_unshift($this->content, $content);
47	47	else
48		- $this->content[] = $content;
	48	+ $this->content[]=$content;
49	49	return $this;
50	50	}
51	51
		@@ -68,9 +68,9 @@ discard block
		block discarded – undo
68	68
69	69	public function setValue($value) {}
70	70
71		- public function wrapContent($before, $after = "") {
72		- $this->wrapContentBefore .= $before;
73		- $this->wrapContentAfter = $after . $this->wrapContentAfter;
	71	+ public function wrapContent($before, $after="") {
	72	+ $this->wrapContentBefore.=$before;
	73	+ $this->wrapContentAfter=$after.$this->wrapContentAfter;
74	74	return $this;
75	75	}
76	76
		@@ -89,14 +89,14 @@ discard block
		block discarded – undo
89	89	}
90	90
91	91	protected function _getContentInstances($class, $content) {
92		- $instances = [];
	92	+ $instances=[];
93	93	if ($content instanceof $class) {
94		- $instances[] = $content;
	94	+ $instances[]=$content;
95	95	} elseif ($content instanceof HtmlDoubleElement) {
96		- $instances = \array_merge($instances, $content->getContentInstances($class));
	96	+ $instances=\array_merge($instances, $content->getContentInstances($class));
97	97	} elseif (\is_array($content)) {
98	98	foreach ($content as $element) {
99		- $instances = \array_merge($instances, $this->_getContentInstances($class, $element));
	99	+ $instances=\array_merge($instances, $this->_getContentInstances($class, $element));
100	100	}
101	101	}
102	102	return $instances;
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	*
108	108	* @return HtmlDoubleElement
109	109	*/
110		- public function asLink($href = NULL, $target = NULL) {
	110	+ public function asLink($href=NULL, $target=NULL) {
111	111	if (isset($href))
112	112	$this->setProperty("href", $href);
113	113	if (isset($target))
		@@ -122,28 +122,28 @@ discard block
		block discarded – undo
122	122	return strip_tags($this->content);
123	123	}
124	124
125		- public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") {
126		- $idF = $field->getIdentifier();
127		- $idE = $idF;
	125	+ public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
	126	+ $idF=$field->getIdentifier();
	127	+ $idE=$idF;
128	128	if ($asForm) {
129		- $frm = new HtmlForm("frm-" . $field->getIdentifier());
	129	+ $frm=new HtmlForm("frm-".$field->getIdentifier());
130	130	$frm->setProperty("onsubmit", "return false;");
131		- $fields = $frm->addFields();
132		- $idE = $frm->getIdentifier();
	131	+ $fields=$frm->addFields();
	132	+ $idE=$frm->getIdentifier();
133	133	$fields->addItem($field);
134		- $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});");
135		- $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');");
136		- $this->_editableContent = $frm;
137		- $keypress = "";
138		- $focusOut = "";
	134	+ $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
	135	+ $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
	136	+ $this->_editableContent=$frm;
	137	+ $keypress="";
	138	+ $focusOut="";
139	139	} else {
140		- $focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');";
141		- $this->_editableContent = $field;
142		- $keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});";
	140	+ $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
	141	+ $this->_editableContent=$field;
	142	+ $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
143	143	}
144	144	$this->_editableContent->setProperty("style", "display:none;");
145		- $this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});");
146		- $this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();");
	145	+ $this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});");
	146	+ $this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();");
147	147	}
148	148
149	149	/**
		@@ -151,8 +151,8 @@ discard block
		block discarded – undo
151	151	* {@inheritdoc}
152	152	* @see \Ajax\common\html\BaseHtml::compile_once()
153	153	*/
154		- protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
155		- if (! $this->_compiled && isset($this->_editableContent)) {
	154	+ protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
	155	+ if (!$this->_compiled && isset($this->_editableContent)) {
156	156	$this->wrap("", $this->_editableContent);
157	157	}
158	158	parent::compile_once($js, $view);

phpMv / phpMv-UI

Push — master ( 75b4ea...e63bba )

Status

Category

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch