\is_array refactoring

jcheron · jcheron · commit 299fb120799b · 2017-01-29T18:46:47.000+01:00
diff --git a/Ajax/Jquery.php b/Ajax/Jquery.php
@@ -202,7 +202,7 @@ public function tablesorter($table='', $options='') {
 	 * @return string
 	 */
 	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
-		if (is_array($js)) {
+		if (\is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
 		if ($preventDefault===true) {
diff --git a/Ajax/JsUtils.php b/Ajax/JsUtils.php
@@ -155,7 +155,7 @@ public function config($config=NULL) {
 			if ($this->config===NULL) {
 				$this->config=new DefaultConfig();
 			}
-		} elseif (is_array($config)) {
+		} elseif (\is_array($config)) {
 			$this->config=new Config($config);
 		} elseif ($config instanceof Config) {
 			$this->config=$config;
@@ -306,7 +306,7 @@ public function generate_json($result=NULL, $match_array_type=FALSE) {
 		if (!is_null($result)) {
 			if (is_object($result)) {
 				$json_result=$result->result_array();
-			} elseif (is_array($result)) {
+			} elseif (\is_array($result)) {
 				$json_result=$result;
 			} else {
 				return $this->_prep_args($result);
@@ -378,7 +378,7 @@ public function getCDNs() {
 	}
 
 	public function setCDNs($cdns) {
-		if (is_array($cdns)===false) {
+		if (!\is_array($cdns)) {
 			$cdns=array (
 					$cdns
 			);
diff --git a/Ajax/bootstrap/html/HtmlBreadcrumbs.php b/Ajax/bootstrap/html/HtmlBreadcrumbs.php
@@ -62,7 +62,7 @@ public function __construct($identifier,$elements=array(),$autoActive=true,$star
 	 */
 	public function addElement($element,$href="",$glyph=NULL){
 		$size=sizeof($this->content);
-		if(is_array($element)){
+		if(\is_array($element)){
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
 		}else if($element instanceof HtmlLink){
diff --git a/Ajax/bootstrap/html/HtmlButtongroups.php b/Ajax/bootstrap/html/HtmlButtongroups.php
@@ -74,7 +74,7 @@ public function addElement($element) {
 			$this->elements[]=$element;
 		} elseif ($element instanceof HtmlButton) {
 			$this->elements[]=$element;
-		} elseif (is_array($element)) {
+		} elseif (\is_array($element)) {
 			if (array_key_exists("glyph", $element))
 				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
 			elseif (array_key_exists("btnCaption", $element)) {
diff --git a/Ajax/bootstrap/html/HtmlCarousel.php b/Ajax/bootstrap/html/HtmlCarousel.php
@@ -27,7 +27,7 @@ public function __construct($identifier, $images=NULL) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplCarousel.php';
 		if ($images!=NULL) {
-			if (is_array($images)) {
+			if (\is_array($images)) {
 				$this->fromArray($images);
 			}
 		}
@@ -93,7 +93,7 @@ public function setLeftGlyph($glyphicon) {
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
-		if(is_array($imageSrc)){
+		if(\is_array($imageSrc)){
 			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
 		}else{
 			$image=new HtmlCarouselItem("item-".$this->identifier);
@@ -117,9 +117,9 @@ public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NU
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		if (is_array($array) && sizeof($array)>0) {
+		if (\is_array($array) && sizeof($array)>0) {
 			foreach ( $array as $value ) {
-				if (is_array($value)) {
+				if (\is_array($value)) {
 					$this->addImage($value ["src"], @$value ["alt"], @$value ["caption"], @$value ["description"]);
 				} else {
 					$this->addImage($value);
diff --git a/Ajax/bootstrap/html/HtmlDropdown.php b/Ajax/bootstrap/html/HtmlDropdown.php
@@ -108,11 +108,11 @@ public function addHeader($caption) {
 
 	public function addItems($items) {
 		$iid=$this->getItemsCount()+1;
-		if (is_array($items)) {
+		if (\is_array($items)) {
 			foreach ( $items as $item ) {
 				if (is_string($item)) {
 					$this->addItem($item);
-				} else if (is_array($item)) {
+				} else if (\is_array($item)) {
 					$dropDownItem=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
 					$dropDownItem->fromArray($item);
 					$this->items []=$dropDownItem;
diff --git a/Ajax/bootstrap/html/HtmlListgroup.php b/Ajax/bootstrap/html/HtmlListgroup.php
@@ -37,7 +37,7 @@ public function addItem($text="") {
 		}
 
 		$item=new HtmlListgroupItem($element);
-		if (is_array($text)===true) {
+		if (\is_array($text)) {
 			$item->setHeadingAndContent($text);
 		}
 		$this->content []=$item;
diff --git a/Ajax/bootstrap/html/HtmlNavbar.php b/Ajax/bootstrap/html/HtmlNavbar.php
@@ -106,7 +106,7 @@ public function fromArray($array) {
 	}
 
 	public function setNavZones($navZones) {
-		if (is_array($navZones)) {
+		if (\is_array($navZones)) {
 			foreach ( $navZones as $zoneType => $zoneArray ) {
 				if (is_string($zoneType)) {
 					$zone=$this->addZone($zoneType);
diff --git a/Ajax/bootstrap/html/HtmlProgressbar.php b/Ajax/bootstrap/html/HtmlProgressbar.php
@@ -29,7 +29,7 @@ public function __construct($identifier, $style="info", $value=0, $max=100, $min
 	}
 
 	public function setActive($value) {
-		if(is_array($this->content)){
+		if(\is_array($this->content)){
 			foreach ($this->content as $pb){
 				$pb->setActive($value);
 			}
@@ -43,7 +43,7 @@ public function setActive($value) {
 	}
 
 	public function setStriped($value) {
-		if(is_array($this->content)){
+		if(\is_array($this->content)){
 			foreach ($this->content as $pb){
 				$pb->setStriped($value);
 			}
@@ -57,7 +57,7 @@ public function setStriped($value) {
 	}
 
 	public function showCaption($value) {
-		if(is_array($this->content)){
+		if(\is_array($this->content)){
 			foreach ($this->content as $pb){
 				$pb->showCaption($value);
 			}
@@ -80,7 +80,7 @@ public function stack(HtmlProgressbar $progressBar) {
 		$progressBar->showCaption($this->caption=="%value%%");
 		$progressBar->setStriped($this->striped!=="" || $progressBar->isStriped());
 		$progressBar->setActive($this->active==="active" || $progressBar->isActive());
-		if (is_array($this->content)===false) {
+		if (!is_array($this->content)) {
 			$this->content=array ();
 		}
 		$this->content []=$progressBar;
diff --git a/Ajax/bootstrap/html/HtmlTabs.php b/Ajax/bootstrap/html/HtmlTabs.php
@@ -56,7 +56,7 @@ public function addTab($element, $index=null) {
 		if (is_string($element)) {
 			$tab=new HtmlTabItem("tab-".$this->identifier."-".$iid, $element);
 			$this->addTab_($tab, $index);
-		} elseif (is_array($element)) {
+		} elseif (\is_array($element)) {
 			$tab=new HtmlTabItem("tab-".$this->identifier."-".$iid);
 			$tab->fromArray($element);
 			$this->addTab_($tab, $index);
diff --git a/Ajax/bootstrap/html/content/HtmlListgroupItem.php b/Ajax/bootstrap/html/content/HtmlListgroupItem.php
@@ -59,7 +59,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 	}
 
 	public function setHeadingAndContent($title, $content="", $niveau="1") {
-		if (is_array($title)) {
+		if (\is_array($title)) {
 			$array=$title;
 			$title=JArray::getValue($array, "title", 0);
 			$content=JArray::getValue($array, "content", 1);
diff --git a/Ajax/bootstrap/html/content/HtmlNavzone.php b/Ajax/bootstrap/html/content/HtmlNavzone.php
@@ -43,7 +43,7 @@ public function addElement($element) {
 			$this->addLink($element);
 		} else if (is_object($element)) {
 			$this->elements []=$element;
-		} else if (is_array($element)) {
+		} else if (\is_array($element)) {
 			$this->addLink(array_pop($element), array_pop($element));
 		} else {
 			$this->addLink($element);
@@ -58,12 +58,12 @@ public function setValues($class, $tagName, $elements=array()) {
 	}
 
 	public function addElements($elements) {
-		if (is_array($elements)) {
+		if (\is_array($elements)) {
 			foreach ( $elements as $key => $element ) {
 				$iid=$this->getElementsCount()+1;
 				if ($element instanceof HtmlDropdownItem)
 					$this->elements []=$element;
-				else if (is_array($element)) {
+				else if (\is_array($element)) {
 					if (is_string($key)===true) {
 						$dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 						$dropdown->addItems($element);
diff --git a/Ajax/common/BaseGui.php b/Ajax/common/BaseGui.php
@@ -58,7 +58,7 @@ public function addComponent(SimpleComponent $component, $attachTo, $params) {
 		if (isset($attachTo))
 			$component->attach($attachTo);
 		if (isset($params))
-			if (is_array($params))
+			if (\is_array($params))
 				$component->setParams($params);
 		return $component;
 	}
diff --git a/Ajax/common/components/BaseComponent.php b/Ajax/common/components/BaseComponent.php
@@ -56,7 +56,7 @@ public function compile(JsUtils $js=NULL) {
 	}
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
-		if (is_array($typeCtrl)) {
+		if (\is_array($typeCtrl)) {
 			if (array_search($value, $typeCtrl)===false)
 				throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 		} else {
diff --git a/Ajax/common/components/SimpleComponent.php b/Ajax/common/components/SimpleComponent.php
@@ -74,7 +74,7 @@ public function on($event, $jsCode) {
 	}
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
-		if (is_array($typeCtrl)) {
+		if (\is_array($typeCtrl)) {
 			if (array_search($value, $typeCtrl)===false)
 				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 		} else {
diff --git a/Ajax/common/html/BaseHtml.php b/Ajax/common/html/BaseHtml.php
@@ -80,7 +80,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$result=$this->getTemplate($js);
 		foreach ( $this as $key => $value ) {
 			if (JString::startswith($key, "_") === false && $key !== "events") {
-				if (is_array($value)) {
+				if (\is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
@@ -98,7 +98,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
-		if (is_array($typeCtrl)) {
+		if (\is_array($typeCtrl)) {
 			if (array_search($value, $typeCtrl) === false) {
 				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
 			}
@@ -132,7 +132,7 @@ protected function setMemberCtrl(&$name, $value, $typeCtrl) {
 	}
 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
-		if (is_array($typeCtrl)) {
+		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 			$name.=$separator . $value;
 		}
@@ -157,7 +157,7 @@ public function removeProperty($name) {
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
-			if (is_array($typeCtrl)) {
+			if (\is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
 			$name.=$separator . $value;
@@ -173,7 +173,7 @@ protected function addToMember(&$name, $value, $separator=" ") {
 	protected function addToPropertyUnique($name, $value, $typeCtrl) {
 		if (@class_exists($typeCtrl, true))
 			$typeCtrl=$typeCtrl::getConstants();
-		if (is_array($typeCtrl)) {
+		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($this->properties[$name], $typeCtrl);
 		}
 		return $this->addToProperty($name, $value);
@@ -261,7 +261,7 @@ public function wrap($before, $after="") {
 
 
 	public function getElementById($identifier, $elements) {
-		if (is_array($elements)) {
+		if (\is_array($elements)) {
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
@@ -279,7 +279,7 @@ public function getElementById($identifier, $elements) {
 	}
 
 	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		if (is_array($elements)) {
+		if (\is_array($elements)) {
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {
diff --git a/Ajax/common/html/HtmlDoubleElement.php b/Ajax/common/html/HtmlDoubleElement.php
@@ -28,7 +28,7 @@ public function getContent() {
 	}
 
 	public function addContent($content,$before=false) {
-		if (is_array($this->content)===false) {
+		if (!\is_array($this->content)) {
 			if(isset($this->content))
 				$this->content=array ($this->content);
 			else
@@ -49,7 +49,7 @@ public function run(JsUtils $js) {
 		parent::run($js);
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
-		} else if (is_array($this->content)) {
+		} else if (\is_array($this->content)) {
 			foreach ( $this->content as $itemContent ) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
diff --git a/Ajax/common/html/HtmlSingleElement.php b/Ajax/common/html/HtmlSingleElement.php
@@ -13,7 +13,7 @@ public function __construct($identifier, $tagName="br") {
 	}
 
 	public function setClass($classNames) {
-		if(is_array($classNames)){
+		if(\is_array($classNames)){
 			$classNames=implode(" ", $classNames);
 		}
 		$this->setProperty("class", $classNames);
diff --git a/Ajax/common/html/PropertyWrapper.php b/Ajax/common/html/PropertyWrapper.php
@@ -11,7 +11,7 @@ public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') {
 		if (is_string($input)) {
 			$output=$input;
 		}
-		if (is_array($input)) {
+		if (\is_array($input)) {
 			if (sizeof($input) > 0) {
 				if (self::containsElement($input) === false) {
 					$output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"');
@@ -25,7 +25,7 @@ public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') {
 
 	private static function containsElement($input) {
 		foreach ( $input as $v ) {
-			if (\is_object($v) === true || \is_array($v))
+			if (\is_object($v) || \is_array($v))
 				return true;
 		}
 		return false;
diff --git a/Ajax/common/html/traits/BaseHtmlEventsTrait.php b/Ajax/common/html/traits/BaseHtmlEventsTrait.php
@@ -32,7 +32,7 @@ public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefaul
 	 */
 	public function _addEvent($event, $jsCode) {
 		if (array_key_exists($event, $this->_events)) {
-			if (is_array($this->_events[$event])) {
+			if (\is_array($this->_events[$event])) {
 				$this->_events[$event][]=$jsCode;
 			} else {
 				$this->_events[$event]=array ($this->_events[$event],$jsCode );
@@ -69,7 +69,7 @@ public function addEventsOnRun(JsUtils $js=NULL) {
 		if (isset($this->_bsComponent)) {
 			foreach ( $this->_events as $event => $jsCode ) {
 				$code=$jsCode;
-				if (is_array($jsCode)) {
+				if (\is_array($jsCode)) {
 					$code="";
 					foreach ( $jsCode as $jsC ) {
 						if ($jsC instanceof AjaxCall) {
diff --git a/Ajax/common/traits/JqueryActionsTrait.php b/Ajax/common/traits/JqueryActionsTrait.php
@@ -62,7 +62,7 @@ public function _animate($element='this', $params=array(), $speed='', $extra='',
 		$speed=$this->_validate_speed($speed);
 
 		$animations="\t\t\t";
-		if (is_array($params)) {
+		if (\is_array($params)) {
 			foreach ( $params as $param => $value ) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
diff --git a/Ajax/php/cakephp/_JsUtils.php b/Ajax/php/cakephp/_JsUtils.php
@@ -36,7 +36,7 @@ public function createScriptVariable(&$view,$view_var, $output){
 	 */
 	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
 		\ob_start();
-		if(isset($params) && \is_array($params)===false){
+		if(isset($params) && !\is_array($params)){
 			$params=[$params];
 		}
 		$url=h(Router::url(\array_merge([
diff --git a/Ajax/php/ci/JsUtils.php b/Ajax/php/ci/JsUtils.php
@@ -53,7 +53,7 @@ public function fromDispatcher($dispatcher){
 	}
 
 	public function controller($controller, $name = '', $db_conn = FALSE){
-		if (is_array($controller)){
+		if (\is_array($controller)){
 			foreach ($controller as $babe){
 				$this->controller($babe);
 			}
diff --git a/Ajax/php/yii/URI.php b/Ajax/php/yii/URI.php
@@ -104,7 +104,7 @@ function _fetch_uri_string() {
 			}
 
 			// As a last ditch effort lets try using the $_GET array
-			if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') {
+			if (\is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') {
 				$this->_set_uri_string(key($_GET));
 				return;
 			}
diff --git a/Ajax/semantic/components/search/SearchResults.php b/Ajax/semantic/components/search/SearchResults.php
@@ -31,7 +31,7 @@ public function addResult($object) {
 	}
 
 	public function addResults($objects) {
-		if (\is_array($objects) === false) {
+		if (!\is_array($objects)) {
 			return $this->addResult($objects);
 		}
 		if (JArray::dimension($objects) === 1) {
diff --git a/Ajax/semantic/html/base/HtmlSemNavElement.php b/Ajax/semantic/html/base/HtmlSemNavElement.php
diff --git a/Ajax/semantic/html/base/constants/State.php b/Ajax/semantic/html/base/constants/State.php
diff --git a/Ajax/semantic/html/collections/form/HtmlForm.php b/Ajax/semantic/html/collections/form/HtmlForm.php
diff --git a/Ajax/semantic/html/collections/form/HtmlFormFields.php b/Ajax/semantic/html/collections/form/HtmlFormFields.php
diff --git a/Ajax/semantic/html/content/table/HtmlTR.php b/Ajax/semantic/html/content/table/HtmlTR.php
diff --git a/Ajax/semantic/html/content/table/HtmlTableContent.php b/Ajax/semantic/html/content/table/HtmlTableContent.php
diff --git a/Ajax/semantic/html/modules/HtmlProgress.php b/Ajax/semantic/html/modules/HtmlProgress.php
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
diff --git a/Ajax/semantic/widgets/datatable/Pagination.php b/Ajax/semantic/widgets/datatable/Pagination.php
diff --git a/Ajax/service/JArray.php b/Ajax/service/JArray.php
diff --git a/Ajax/service/Javascript.php b/Ajax/service/Javascript.php

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public function tablesorter($table='', $options='') {`
`202`	`202`	`* @return string`
`203`	`203`	`*/`
`204`	`204`	`public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {`
`205`		`- if (is_array($js)) {`
	`205`	`+ if (\is_array($js)) {`
`206`	`206`	`$js=implode("\n\t\t", $js);`
`207`	`207`	`}`
`208`	`208`	`if ($preventDefault===true) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function addItem($text="") {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`$item=new HtmlListgroupItem($element);`
`40`		`- if (is_array($text)===true) {`
	`40`	`+ if (\is_array($text)) {`
`41`	`41`	`$item->setHeadingAndContent($text);`
`42`	`42`	`}`
`43`	`43`	`$this->content []=$item;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function fromArray($array) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public function setNavZones($navZones) {`
`109`		`- if (is_array($navZones)) {`
	`109`	`+ if (\is_array($navZones)) {`
`110`	`110`	`foreach ( $navZones as $zoneType => $zoneArray ) {`
`111`	`111`	`if (is_string($zoneType)) {`
`112`	`112`	`$zone=$this->addZone($zoneType);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct($identifier, $style="info", $value=0, $max=100, $min`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function setActive($value) {`
`32`		`- if(is_array($this->content)){`
	`32`	`+ if(\is_array($this->content)){`
`33`	`33`	`foreach ($this->content as $pb){`
`34`	`34`	`$pb->setActive($value);`
`35`	`35`	`}`
`@@ -43,7 +43,7 @@ public function setActive($value) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function setStriped($value) {`
`46`		`- if(is_array($this->content)){`
	`46`	`+ if(\is_array($this->content)){`
`47`	`47`	`foreach ($this->content as $pb){`
`48`	`48`	`$pb->setStriped($value);`
`49`	`49`	`}`
`@@ -57,7 +57,7 @@ public function setStriped($value) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function showCaption($value) {`
`60`		`- if(is_array($this->content)){`
	`60`	`+ if(\is_array($this->content)){`
`61`	`61`	`foreach ($this->content as $pb){`
`62`	`62`	`$pb->showCaption($value);`
`63`	`63`	`}`
`@@ -80,7 +80,7 @@ public function stack(HtmlProgressbar $progressBar) {`
`80`	`80`	`$progressBar->showCaption($this->caption=="%value%%");`
`81`	`81`	`$progressBar->setStriped($this->striped!=="" \|\| $progressBar->isStriped());`
`82`	`82`	`$progressBar->setActive($this->active==="active" \|\| $progressBar->isActive());`
`83`		`- if (is_array($this->content)===false) {`
	`83`	`+ if (!is_array($this->content)) {`
`84`	`84`	`$this->content=array ();`
`85`	`85`	`}`
`86`	`86`	`$this->content []=$progressBar;`