@@ -28,8 +28,9 @@ discard block |
||
| 28 | 28 | $this->addImage($image); |
| 29 | 29 | } |
| 30 | 30 | $this->addHeaderContent($header, $metas, $description,$extra); |
| 31 | - } else |
|
| 32 | - $this->addContent($value); |
|
| 31 | + } else { |
|
| 32 | + $this->addContent($value); |
|
| 33 | + } |
|
| 33 | 34 | } |
| 34 | 35 | |
| 35 | 36 | public function addElement($content, $baseClass="") { |
@@ -62,8 +63,9 @@ discard block |
||
| 62 | 63 | |
| 63 | 64 | public function addImage($src="", $alt="", $size=NULL) { |
| 64 | 65 | $image=new HtmlImg("img-", $src, $alt); |
| 65 | - if (isset($size)) |
|
| 66 | - $image->setSize($size); |
|
| 66 | + if (isset($size)) { |
|
| 67 | + $image->setSize($size); |
|
| 68 | + } |
|
| 67 | 69 | $this->content['image']=$image; |
| 68 | 70 | return $image; |
| 69 | 71 | } |
@@ -86,8 +88,9 @@ discard block |
||
| 86 | 88 | foreach ( $metas as $meta ) { |
| 87 | 89 | $this->addMeta($meta); |
| 88 | 90 | } |
| 89 | - } else |
|
| 90 | - $this->addMeta($metas); |
|
| 91 | + } else { |
|
| 92 | + $this->addMeta($metas); |
|
| 93 | + } |
|
| 91 | 94 | return $this; |
| 92 | 95 | } |
| 93 | 96 | |
@@ -114,8 +117,9 @@ discard block |
||
| 114 | 117 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
| 115 | 118 | $this->addContent($result); |
| 116 | 119 | $result->setFloated($direction); |
| 117 | - } else |
|
| 118 | - $result=$this->addContent($caption); |
|
| 120 | + } else { |
|
| 121 | + $result=$this->addContent($caption); |
|
| 122 | + } |
|
| 119 | 123 | return $result; |
| 120 | 124 | } |
| 121 | 125 | |
@@ -127,8 +131,9 @@ discard block |
||
| 127 | 131 | } |
| 128 | 132 | |
| 129 | 133 | public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
| 130 | - if(isset($header)) |
|
| 131 | - $this->addElement($header, "header"); |
|
| 134 | + if(isset($header)) { |
|
| 135 | + $this->addElement($header, "header"); |
|
| 136 | + } |
|
| 132 | 137 | $this->addMetas($metas); |
| 133 | 138 | if (isset($description)) { |
| 134 | 139 | $this->addElement($description, "description"); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
| 50 | 50 | $compilation.=$ajaxSubmitItem->compile($js); |
| 51 | 51 | } |
| 52 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
| 52 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
| 53 | 53 | $compilation=$ajaxSubmit->compile($js); |
| 54 | 54 | } |
| 55 | 55 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -67,8 +67,9 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function setAttached($value=true){ |
| 69 | 69 | $form=$this->getForm(); |
| 70 | - if($value) |
|
| 71 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 70 | + if($value) { |
|
| 71 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 72 | + } |
|
| 72 | 73 | return $form; |
| 73 | 74 | } |
| 74 | 75 | |
@@ -90,10 +91,11 @@ discard block |
||
| 90 | 91 | */ |
| 91 | 92 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
| 92 | 93 | $form=$this->getForm(); |
| 93 | - if($identifierOrElement instanceof BaseHtml) |
|
| 94 | - $elem=$identifierOrElement; |
|
| 95 | - else |
|
| 96 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
| 94 | + if($identifierOrElement instanceof BaseHtml) { |
|
| 95 | + $elem=$identifierOrElement; |
|
| 96 | + } else { |
|
| 97 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
| 98 | + } |
|
| 97 | 99 | if(isset($elem)){ |
| 98 | 100 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
| 99 | 101 | } |
@@ -123,8 +123,9 @@ |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public function run(JsUtils $js){ |
| 126 | - if(JString::isNotNull($this->_identifier)) |
|
| 127 | - $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
| 126 | + if(JString::isNotNull($this->_identifier)) { |
|
| 127 | + $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
| 128 | + } |
|
| 128 | 129 | parent::run($js); |
| 129 | 130 | } |
| 130 | 131 | } |
@@ -41,8 +41,9 @@ discard block |
||
| 41 | 41 | * @param string $popupEvent |
| 42 | 42 | */ |
| 43 | 43 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
| 44 | - if (isset($this->_popup)) |
|
| 45 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
| 44 | + if (isset($this->_popup)) { |
|
| 45 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
| 46 | + } |
|
| 46 | 47 | } |
| 47 | 48 | |
| 48 | 49 | /** |
@@ -97,8 +98,9 @@ discard block |
||
| 97 | 98 | $labelO=$label; |
| 98 | 99 | if (\is_object($label) === false) { |
| 99 | 100 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
| 100 | - if (isset($icon)) |
|
| 101 | - $labelO->addIcon($icon); |
|
| 101 | + if (isset($icon)) { |
|
| 102 | + $labelO->addIcon($icon); |
|
| 103 | + } |
|
| 102 | 104 | } else { |
| 103 | 105 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
| 104 | 106 | } |
@@ -125,10 +127,12 @@ discard block |
||
| 125 | 127 | * @return HtmlSemDoubleElement |
| 126 | 128 | */ |
| 127 | 129 | public function asLink($href=NULL,$target=NULL) { |
| 128 | - if (isset($href)) |
|
| 129 | - $this->setProperty("href", $href); |
|
| 130 | - if(isset($target)) |
|
| 131 | - $this->setProperty("target", $target); |
|
| 130 | + if (isset($href)) { |
|
| 131 | + $this->setProperty("href", $href); |
|
| 132 | + } |
|
| 133 | + if(isset($target)) { |
|
| 134 | + $this->setProperty("target", $target); |
|
| 135 | + } |
|
| 132 | 136 | return $this->setTagName("a"); |
| 133 | 137 | } |
| 134 | 138 | |
@@ -139,8 +143,9 @@ discard block |
||
| 139 | 143 | */ |
| 140 | 144 | public function jsShowDimmer($show=true) { |
| 141 | 145 | $status="hide"; |
| 142 | - if ($show === true) |
|
| 143 | - $status="show"; |
|
| 146 | + if ($show === true) { |
|
| 147 | + $status="show"; |
|
| 148 | + } |
|
| 144 | 149 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
| 145 | 150 | } |
| 146 | 151 | |
@@ -16,8 +16,9 @@ discard block |
||
| 16 | 16 | * @param mixed $view |
| 17 | 17 | */ |
| 18 | 18 | protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
| 19 | - if(isset($view)) |
|
| 20 | - $library->compileHtml($this, $view); |
|
| 19 | + if(isset($view)) { |
|
| 20 | + $library->compileHtml($this, $view); |
|
| 21 | + } |
|
| 21 | 22 | if ($library->isAutoCompile()) { |
| 22 | 23 | $library->compile(true); |
| 23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
| 36 | 37 | } |
| 37 | 38 | |
| 38 | 39 | protected function minify($input) { |
| 39 | - if(trim($input) === "") return $input; |
|
| 40 | + if(trim($input) === "") { |
|
| 41 | + return $input; |
|
| 42 | + } |
|
| 40 | 43 | $input= preg_replace( |
| 41 | 44 | array( |
| 42 | 45 | // Remove comment(s) |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $retour.="var self=this;\n"; |
| 33 | 33 | if($hasLoader===true && JString::isNotNull($responseElement)){ |
| 34 | 34 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
| 35 | - }elseif($hasLoader==="internal"){ |
|
| 35 | + } elseif($hasLoader==="internal"){ |
|
| 36 | 36 | $retour.="\n$(this).addClass('loading');"; |
| 37 | 37 | } |
| 38 | 38 | $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 50 | 50 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n"; |
| 51 | 51 | $retour=$this->_addJsCondition($jsCondition,$retour); |
| 52 | - if ($immediatly) |
|
| 53 | - $this->jquery_code_for_compile[]=$retour; |
|
| 52 | + if ($immediatly) { |
|
| 53 | + $this->jquery_code_for_compile[]=$retour; |
|
| 54 | + } |
|
| 54 | 55 | return $retour; |
| 55 | 56 | } |
| 56 | 57 | |
@@ -86,12 +87,13 @@ discard block |
||
| 86 | 87 | if(JString::isNotNull($attr)){ |
| 87 | 88 | if ($attr==="value"){ |
| 88 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 89 | - }elseif ($attr==="html"){ |
|
| 90 | + } elseif ($attr==="html"){ |
|
| 90 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 91 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 92 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
| 92 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 93 | - }elseif($attr!==null && $attr!=="") |
|
| 94 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 94 | + } elseif($attr!==null && $attr!=="") { |
|
| 95 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 96 | + } |
|
| 95 | 97 | } |
| 96 | 98 | return $retour; |
| 97 | 99 | } |
@@ -111,13 +113,14 @@ discard block |
||
| 111 | 113 | if (JString::isNotNull($responseElement)) { |
| 112 | 114 | if(isset($ajaxTransition)){ |
| 113 | 115 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 114 | - }elseif(isset($this->ajaxTransition)){ |
|
| 116 | + } elseif(isset($this->ajaxTransition)){ |
|
| 115 | 117 | $call=$this->ajaxTransition; |
| 116 | 118 | } |
| 117 | - if(\is_callable($call)) |
|
| 118 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 119 | - else |
|
| 120 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 119 | + if(\is_callable($call)) { |
|
| 120 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 121 | + } else { |
|
| 122 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 123 | + } |
|
| 121 | 124 | } |
| 122 | 125 | if(isset($history)){ |
| 123 | 126 | if($this->params["autoActiveLinks"]){ |
@@ -140,8 +143,9 @@ discard block |
||
| 140 | 143 | } |
| 141 | 144 | |
| 142 | 145 | protected function _correctAjaxUrl($url) { |
| 143 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 144 | - $url=substr($url, 0, strlen($url)-1); |
|
| 146 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 147 | + $url=substr($url, 0, strlen($url)-1); |
|
| 148 | + } |
|
| 145 | 149 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 146 | 150 | $url=$this->getUrl($url); |
| 147 | 151 | } |
@@ -161,8 +165,9 @@ discard block |
||
| 161 | 165 | public static function _implodeParams($parameters){ |
| 162 | 166 | $allParameters=[]; |
| 163 | 167 | foreach ($parameters as $params){ |
| 164 | - if(isset($params)) |
|
| 165 | - $allParameters[]=self::_correctParams($params); |
|
| 168 | + if(isset($params)) { |
|
| 169 | + $allParameters[]=self::_correctParams($params); |
|
| 170 | + } |
|
| 166 | 171 | } |
| 167 | 172 | return \implode("+'&'+", $allParameters); |
| 168 | 173 | } |
@@ -188,8 +193,9 @@ discard block |
||
| 188 | 193 | |
| 189 | 194 | protected function setDefaultParameters(&$parameters,$default){ |
| 190 | 195 | foreach ($default as $k=>$v){ |
| 191 | - if(!isset($parameters[$k])) |
|
| 192 | - $parameters[$k]=$v; |
|
| 196 | + if(!isset($parameters[$k])) { |
|
| 197 | + $parameters[$k]=$v; |
|
| 198 | + } |
|
| 193 | 199 | } |
| 194 | 200 | } |
| 195 | 201 | |
@@ -307,7 +313,7 @@ discard block |
||
| 307 | 313 | if($context===null){ |
| 308 | 314 | $parent="$('".$maskSelector."').parent()"; |
| 309 | 315 | $newElm = "$('#'+newId)"; |
| 310 | - }else{ |
|
| 316 | + } else{ |
|
| 311 | 317 | $parent=$context; |
| 312 | 318 | $newElm = $context.".find('#'+newId)"; |
| 313 | 319 | } |
@@ -533,7 +539,7 @@ discard block |
||
| 533 | 539 | $retour.="var self=this;\n"; |
| 534 | 540 | if($hasLoader===true){ |
| 535 | 541 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
| 536 | - }elseif($hasLoader==="internal"){ |
|
| 542 | + } elseif($hasLoader==="internal"){ |
|
| 537 | 543 | $retour.="\n$(this).addClass('loading');"; |
| 538 | 544 | } |
| 539 | 545 | $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
@@ -551,8 +557,9 @@ discard block |
||
| 551 | 557 | $retour.="$('#".$form."').submit();\n"; |
| 552 | 558 | } |
| 553 | 559 | $retour=$this->_addJsCondition($jsCondition, $retour); |
| 554 | - if ($immediatly) |
|
| 555 | - $this->jquery_code_for_compile[]=$retour; |
|
| 560 | + if ($immediatly) { |
|
| 561 | + $this->jquery_code_for_compile[]=$retour; |
|
| 562 | + } |
|
| 556 | 563 | return $retour; |
| 557 | 564 | } |
| 558 | 565 | |
@@ -23,8 +23,9 @@ discard block |
||
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 27 | - $this->setInstance($instance); |
|
| 26 | + if(isset($instance)) { |
|
| 27 | + $this->setInstance($instance); |
|
| 28 | + } |
|
| 28 | 29 | $this->setCaptions($captions); |
| 29 | 30 | $this->captionCallback=NULL; |
| 30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
| 62 | 63 | } |
| 63 | 64 | |
| 64 | 65 | public function getIdentifier($index=NULL){ |
| 65 | - if(!isset($index)) |
|
| 66 | - $index=self::$index; |
|
| 66 | + if(!isset($index)) { |
|
| 67 | + $index=self::$index; |
|
| 68 | + } |
|
| 67 | 69 | $value=$index; |
| 68 | 70 | if(isset($this->values["identifier"])){ |
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 71 | - else |
|
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 71 | + if(\is_string($this->values["identifier"])) { |
|
| 72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
| 73 | + } else { |
|
| 74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
| 75 | + } |
|
| 73 | 76 | } |
| 74 | 77 | return $value; |
| 75 | 78 | } |
@@ -99,16 +102,16 @@ discard block |
||
| 99 | 102 | if($property instanceof \ReflectionProperty){ |
| 100 | 103 | $value=$this->_getPropertyValue($property); |
| 101 | 104 | $propertyName=$property->getName(); |
| 102 | - }elseif(\is_callable($property) && array_search($property, ["system"])===false) |
|
| 103 | - $value=$property($this->instance); |
|
| 104 | - elseif(\is_array($property)){ |
|
| 105 | + } elseif(\is_callable($property) && array_search($property, ["system"])===false) { |
|
| 106 | + $value=$property($this->instance); |
|
| 107 | + } elseif(\is_array($property)){ |
|
| 105 | 108 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
| 106 | 109 | $value=\implode("", $values); |
| 107 | - }elseif(\is_string($property)){ |
|
| 110 | + } elseif(\is_string($property)){ |
|
| 108 | 111 | $value=$property; |
| 109 | 112 | if(isset($this->instance->{$property})){ |
| 110 | 113 | $value=$this->instance->{$property}; |
| 111 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 114 | + } elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 112 | 115 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 113 | 116 | } |
| 114 | 117 | } |
@@ -118,7 +121,7 @@ discard block |
||
| 118 | 121 | protected function _postGetValue($index,$propertyName,$value){ |
| 119 | 122 | if(isset($this->values[$index])){ |
| 120 | 123 | $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
| 121 | - }else{ |
|
| 124 | + } else{ |
|
| 122 | 125 | $value=$this->_getDefaultValue($propertyName,$value, $index); |
| 123 | 126 | } |
| 124 | 127 | if(isset($this->afterCompile[$index])){ |
@@ -132,7 +135,7 @@ discard block |
||
| 132 | 135 | public function insertField($index,$field,$key=null){ |
| 133 | 136 | if(isset($key)){ |
| 134 | 137 | array_splice( $this->visibleProperties, $index, 0, [$key=>$field] ); |
| 135 | - }else{ |
|
| 138 | + } else{ |
|
| 136 | 139 | array_splice( $this->visibleProperties, $index, 0, $field ); |
| 137 | 140 | } |
| 138 | 141 | return $this; |
@@ -153,17 +156,17 @@ discard block |
||
| 153 | 156 | if(isset($key)){ |
| 154 | 157 | if(\is_array($vb[$index])){ |
| 155 | 158 | $this->visibleProperties[$index][$key]=$field; |
| 156 | - }else{ |
|
| 159 | + } else{ |
|
| 157 | 160 | $this->visibleProperties[$index]=[$vb[$index],$key=>$field]; |
| 158 | 161 | } |
| 159 | - }else{ |
|
| 162 | + } else{ |
|
| 160 | 163 | if(\is_array($vb[$index])){ |
| 161 | 164 | $this->visibleProperties[$index][]=$field; |
| 162 | - }else{ |
|
| 165 | + } else{ |
|
| 163 | 166 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
| 164 | 167 | } |
| 165 | 168 | } |
| 166 | - }else{ |
|
| 169 | + } else{ |
|
| 167 | 170 | return $this->insertField($index, $field); |
| 168 | 171 | } |
| 169 | 172 | return $this; |
@@ -172,7 +175,7 @@ discard block |
||
| 172 | 175 | public function addField($field,$key=null){ |
| 173 | 176 | if(isset($key)){ |
| 174 | 177 | $this->visibleProperties[]=[$key=>$field]; |
| 175 | - }else{ |
|
| 178 | + } else{ |
|
| 176 | 179 | $this->visibleProperties[]=$field; |
| 177 | 180 | } |
| 178 | 181 | return $this; |
@@ -199,9 +202,9 @@ discard block |
||
| 199 | 202 | $property=$this->getProperty($index); |
| 200 | 203 | if($property instanceof \ReflectionProperty){ |
| 201 | 204 | $result=$property->getName(); |
| 202 | - }elseif(\is_callable($property)){ |
|
| 205 | + } elseif(\is_callable($property)){ |
|
| 203 | 206 | $result=$this->visibleProperties[$index]; |
| 204 | - }else{ |
|
| 207 | + } else{ |
|
| 205 | 208 | $result=$property; |
| 206 | 209 | } |
| 207 | 210 | return $result; |
@@ -221,7 +224,7 @@ discard block |
||
| 221 | 224 | $this->reflect=new \ReflectionClass($instance); |
| 222 | 225 | if(JArray::count($this->visibleProperties)===0){ |
| 223 | 226 | $this->properties=$this->getDefaultProperties(); |
| 224 | - }else{ |
|
| 227 | + } else{ |
|
| 225 | 228 | foreach ($this->visibleProperties as $property){ |
| 226 | 229 | $this->setInstanceProperty($property); |
| 227 | 230 | } |
@@ -232,22 +235,23 @@ discard block |
||
| 232 | 235 | private function setInstanceProperty($property){ |
| 233 | 236 | if(\is_callable($property)){ |
| 234 | 237 | $this->properties[]=$property; |
| 235 | - }elseif(\is_string($property)){ |
|
| 238 | + } elseif(\is_string($property)){ |
|
| 236 | 239 | try{ |
| 237 | 240 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 238 | 241 | $rProperty=$this->reflect->getProperty($property); |
| 239 | 242 | $this->properties[]=$rProperty; |
| 240 | - }catch(\Exception $e){ |
|
| 243 | + } catch(\Exception $e){ |
|
| 241 | 244 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 242 | 245 | $this->properties[]=$property; |
| 243 | 246 | } |
| 244 | - }elseif(\is_int($property)){ |
|
| 247 | + } elseif(\is_int($property)){ |
|
| 245 | 248 | $props=$this->getDefaultProperties(); |
| 246 | - if(isset($props[$property])) |
|
| 247 | - $this->properties[]=$props[$property]; |
|
| 248 | - else |
|
| 249 | - $this->properties[]=$property; |
|
| 250 | - }else{ |
|
| 249 | + if(isset($props[$property])) { |
|
| 250 | + $this->properties[]=$props[$property]; |
|
| 251 | + } else { |
|
| 252 | + $this->properties[]=$property; |
|
| 253 | + } |
|
| 254 | + } else{ |
|
| 251 | 255 | $this->properties[]=$property; |
| 252 | 256 | } |
| 253 | 257 | } |
@@ -291,12 +295,13 @@ discard block |
||
| 291 | 295 | if(isset($this->captions[$index])){ |
| 292 | 296 | return $this->captions[$index]; |
| 293 | 297 | } |
| 294 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 295 | - return $this->properties[$index]->getName(); |
|
| 296 | - elseif(\is_callable($this->properties[$index])) |
|
| 297 | - return ""; |
|
| 298 | - else |
|
| 299 | - return $this->properties[$index]; |
|
| 298 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
| 299 | + return $this->properties[$index]->getName(); |
|
| 300 | + } elseif(\is_callable($this->properties[$index])) { |
|
| 301 | + return ""; |
|
| 302 | + } else { |
|
| 303 | + return $this->properties[$index]; |
|
| 304 | + } |
|
| 300 | 305 | } |
| 301 | 306 | |
| 302 | 307 | public function getCaptions(){ |
@@ -307,7 +312,7 @@ discard block |
||
| 307 | 312 | for($i=$captionsSize;$i<$count;$i++){ |
| 308 | 313 | $captions[]=""; |
| 309 | 314 | } |
| 310 | - }else{ |
|
| 315 | + } else{ |
|
| 311 | 316 | $captions=[]; |
| 312 | 317 | $index=0; |
| 313 | 318 | while($index<$count){ |
@@ -322,8 +327,9 @@ discard block |
||
| 322 | 327 | } |
| 323 | 328 | |
| 324 | 329 | public function setCaption($index,$caption){ |
| 325 | - if(isset($this->captions)===false) |
|
| 326 | - $this->captions=[]; |
|
| 330 | + if(isset($this->captions)===false) { |
|
| 331 | + $this->captions=[]; |
|
| 332 | + } |
|
| 327 | 333 | $this->captions[$index]=$caption; |
| 328 | 334 | return $this; |
| 329 | 335 | } |
@@ -109,15 +109,18 @@ discard block |
||
| 109 | 109 | $flag=false; |
| 110 | 110 | $index=0; |
| 111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
| 112 | - if ($elements[$index] instanceof BaseHtml) |
|
| 113 | - $flag=($callback($elements[$index])); |
|
| 112 | + if ($elements[$index] instanceof BaseHtml) { |
|
| 113 | + $flag=($callback($elements[$index])); |
|
| 114 | + } |
|
| 114 | 115 | $index++; |
| 115 | 116 | } |
| 116 | - if ($flag === true) |
|
| 117 | - return $elements[$index - 1]; |
|
| 117 | + if ($flag === true) { |
|
| 118 | + return $elements[$index - 1]; |
|
| 119 | + } |
|
| 118 | 120 | } elseif ($elements instanceof BaseHtml) { |
| 119 | - if ($callback($elements)) |
|
| 120 | - return $elements; |
|
| 121 | + if ($callback($elements)) { |
|
| 122 | + return $elements; |
|
| 123 | + } |
|
| 121 | 124 | } |
| 122 | 125 | return null; |
| 123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
| 143 | 146 | |
| 144 | 147 | public function fromArray($array) { |
| 145 | 148 | foreach ( $this as $key => $value ) { |
| 146 | - if(array_key_exists($key, $array)===true) |
|
| 147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 149 | + if(array_key_exists($key, $array)===true) { |
|
| 150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 151 | + } |
|
| 148 | 152 | } |
| 149 | 153 | foreach ( $array as $key => $value ) { |
| 150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,11 +217,11 @@ discard block |
||
| 213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
| 214 | 218 | if (\is_array($value)) { |
| 215 | 219 | $v=PropertyWrapper::wrap($value, $js,$view); |
| 216 | - }elseif($value instanceof \stdClass){ |
|
| 220 | + } elseif($value instanceof \stdClass){ |
|
| 217 | 221 | $v=\print_r($value,true); |
| 218 | - }elseif ($value instanceof BaseHtml){ |
|
| 222 | + } elseif ($value instanceof BaseHtml){ |
|
| 219 | 223 | $v=$value->compile($js,$view); |
| 220 | - }else{ |
|
| 224 | + } else{ |
|
| 221 | 225 | $v=$value; |
| 222 | 226 | } |
| 223 | 227 | $result=str_replace("%{$key}%", $v, $result); |
@@ -345,8 +345,9 @@ discard block |
||
| 345 | 345 | $result= $this->getBody()->_addRow($result); |
| 346 | 346 | } |
| 347 | 347 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
| 348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
| 349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
| 348 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
| 349 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
| 350 | + } |
|
| 350 | 351 | } |
| 351 | 352 | return $result; |
| 352 | 353 | } |
@@ -375,8 +376,9 @@ discard block |
||
| 375 | 376 | } |
| 376 | 377 | } |
| 377 | 378 | $result= parent::run($js); |
| 378 | - if(isset($this->_footer)) |
|
| 379 | - $this->_footer->run($js); |
|
| 379 | + if(isset($this->_footer)) { |
|
| 380 | + $this->_footer->run($js); |
|
| 381 | + } |
|
| 380 | 382 | $this->_runned=true; |
| 381 | 383 | return $result; |
| 382 | 384 | } |
@@ -417,8 +419,9 @@ discard block |
||
| 417 | 419 | |
| 418 | 420 | public function setColWidth($colIndex,$width){ |
| 419 | 421 | $part=$this->_getFirstPart(); |
| 420 | - if($part!==null && $part->count()>0) |
|
| 421 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
| 422 | + if($part!==null && $part->count()>0) { |
|
| 423 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
| 424 | + } |
|
| 422 | 425 | return $this; |
| 423 | 426 | } |
| 424 | 427 | |