Dolibarr / dolibarr

htdocs/includes/nusoap/lib/nusoap.php

Braces +3 added lines, -6 removed lines

@@ -6508,15 +6508,13 @@ 
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            elseif (isset($attrs['type']) || isset($attrs['ref']))
+                            } elseif (isset($attrs['type']) || isset($attrs['ref']))
                             {
                                 // serialize schema-defined type
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            else
+                            } else
                             {
                                 // serialize generic type (can this ever really happen?)
                                 $this->debug ("calling serialize_val() for $v, $eName, false, false, false, false, $use");
@@ -7018,8 +7016,7 @@ 
                     if (isset($this->namespaces[$value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-                    }
-                    elseif (isset($attrs['xmlns:' . $value_prefix]))
+                    } elseif (isset($attrs['xmlns:' . $value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
                     }

test/phpunit/CMailFileTest.php

Braces +3 added lines, -2 removed lines

@@ -243,10 +243,11 @@
 		$this->assertEquals($result, 2);
 
 
-		foreach ($localobject->html_images as $i => $val)
-		if ($localobject->html_images[$i]) {
+		foreach ($localobject->html_images as $i => $val) {
+				if ($localobject->html_images[$i]) {
 			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
 				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+		}
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
 				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";

htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php

Braces +92 added lines, -59 removed lines

@@ -52,9 +52,11 @@ 
 		 */
 		public static function addPath($path)
 		{
-			if (false === $path = stream_resolve_include_path($path))
-			return false;
-			else set_include_path($path.PATH_SEPARATOR.get_include_path());
+			if (false === $path = stream_resolve_include_path($path)) {
+						return false;
+			} else {
+				set_include_path($path.PATH_SEPARATOR.get_include_path());
+			}
 			return $path;
 		}
 
@@ -67,16 +69,19 @@ 
 		 */
 		public static function thereCanBeOnlyOne()
 		{
-			if (static::$perfectLoaders === spl_autoload_functions())
-			return static::$instance;
+			if (static::$perfectLoaders === spl_autoload_functions()) {
+						return static::$instance;
+			}
 
-			if (false !== $loaders = spl_autoload_functions())
-			if (0 < $count = count($loaders))
+			if (false !== $loaders = spl_autoload_functions()) {
+						if (0 < $count = count($loaders))
 				for ($i = 0, static::$rogueLoaders += $loaders;
+			}
 					 $i < $count && false != ($loader = $loaders[$i]);
-					 $i++)
-					if ($loader !== static::$perfectLoaders[0])
+					 $i++) {
+									if ($loader !== static::$perfectLoaders[0])
 						spl_autoload_unregister($loader);
+				}
 
 			return static::$instance;
 		}
@@ -105,12 +110,14 @@ 
 				return false;
 			}
 
-			if (empty(static::$classMap[$key]))
-			static::$classMap[$key] = $value;
+			if (empty(static::$classMap[$key])) {
+						static::$classMap[$key] = $value;
+			}
 
-			if (is_string($alias = static::$classMap[$key]))
-			if (isset(static::$classMap[$alias]))
+			if (is_string($alias = static::$classMap[$key])) {
+						if (isset(static::$classMap[$alias]))
 				return static::$classMap[$alias];
+			}
 
 			return static::$classMap[$key];
 		}
@@ -138,8 +145,8 @@ 
 					array($dir, 'vendor', 'composer'),
 					array($dir, '..', '..', '..', 'php'),
 					array($dir, 'vendor', 'php'))
-				as $includePath)
-				if (false !== $path = stream_resolve_include_path(
+				as $includePath) {
+								if (false !== $path = stream_resolve_include_path(
 						implode($slash, $includePath)
 					))
 				if ('composer' == end($includePath) &&
@@ -150,18 +157,22 @@ 
 					static::seen(static::loadFile(
 						$classmapPath
 					));
+				}
 					$paths = array_merge(
 						$paths,
 						array_values(static::loadFile(
 							"$path{$slash}autoload_namespaces.php"
 						))
 					);
-				} else $paths[] = $path;
+				} else {
+					$paths[] = $path;
+				}
 
 				$paths = array_filter(array_map(
 				function ($path) {
-					if (false == $realPath = @realpath($path))
-						return null;
+					if (false == $realPath = @realpath($path)) {
+											return null;
+					}
 					return $realPath . DIRECTORY_SEPARATOR;
 				},
 				$paths
@@ -200,9 +211,11 @@ 
 		private function loadPrefixes($className)
 		{
 			$currentClass = $className;
-			if (false !== $pos = strrpos($className, '\\'))
-			$className = substr($className, $pos);
-			else $className = "\\$className";
+			if (false !== $pos = strrpos($className, '\\')) {
+						$className = substr($className, $pos);
+			} else {
+				$className = "\\$className";
+			}
 
 			for (
 			$i = 0,
@@ -231,12 +244,13 @@ 
 		private function loadAliases($className)
 		{
 			$file = false;
-			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
-			for (
+			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) {
+						for (
 				$i = 0,
 				$aliases = isset(static::$aliases[$parts[1]])
 					? static::$aliases[$parts[1]] : array(),
 				$count = count($aliases);
+			}
 				$i < $count && false === $file;
 				$file = $this->discover(
 					"{$aliases[$i++]}$parts[2]",
@@ -263,13 +277,15 @@ 
 		{
 			$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
 			if (isset($loader)) {
-				if (false === array_search($loader, $loaders))
-				static::$rogueLoaders[] = $loader;
+				if (false === array_search($loader, $loaders)) {
+								static::$rogueLoaders[] = $loader;
+				}
 				return $this->loadThisLoader($className, $loader);
 			}
-			foreach ($loaders as $loader)
-			if (false !== $file = $this->loadThisLoader($className, $loader))
+			foreach ($loaders as $loader) {
+						if (false !== $file = $this->loadThisLoader($className, $loader))
 				return $file;
+			}
 
 			return false;
 		}
@@ -313,13 +329,18 @@ 
 		 */
 		private function alias($className, $currentClass)
 		{
-			if ($className == 'Luracast\Restler\string') return;
-			if ($className == 'Luracast\Restler\mixed') return;
+			if ($className == 'Luracast\Restler\string') {
+				return;
+			}
+			if ($className == 'Luracast\Restler\mixed') {
+				return;
+			}
 			if ($className != $currentClass
-			&& false !== strpos($className, $currentClass))
-				if (!class_exists($currentClass, false)
+			&& false !== strpos($className, $currentClass)) {
+							if (!class_exists($currentClass, false)
 					&& class_alias($className, $currentClass))
 						static::seen($currentClass, $className);
+			}
 		}
 
 		/**
@@ -337,11 +358,12 @@ 
 
 			/** The short version we've done this before and found it in cache */
 			if (false !== $file = static::seen($className)) {
-				if (!$this->exists($className))
-				if (is_callable($file))
+				if (!$this->exists($className)) {
+								if (is_callable($file))
 					$file = $this->loadLastResort($className, $file);
-				elseif ($file = stream_resolve_include_path($file))
-					$file = static::loadFile($file);
+				} elseif ($file = stream_resolve_include_path($file)) {
+									$file = static::loadFile($file);
+				}
 
 				$this->alias($className, $currentClass);
 				return $file;
@@ -351,15 +373,17 @@ 
 
 			/** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
 			$file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
-			if (false === $file = stream_resolve_include_path("$file.php"))
-			return false;
+			if (false === $file = stream_resolve_include_path("$file.php")) {
+						return false;
+			}
 
 			/** have we loaded this file before could this be an alias */
 			if (in_array($file, get_included_files())) {
-				if (false !== $sameFile = array_search($file, static::$classMap))
-				if (!$this->exists($className, $file))
+				if (false !== $sameFile = array_search($file, static::$classMap)) {
+								if (!$this->exists($className, $file))
 					if (false !== strpos($sameFile, $className))
 						$this->alias($sameFile, $className);
+				}
 
 				return $file;
 			}
@@ -367,17 +391,19 @@ 
 			$state = array_merge(get_declared_classes(), get_declared_interfaces());
 
 			if (false !== $result = static::loadFile($file)) {
-				if ($this->exists($className, $file))
-				$this->alias($className, $currentClass);
-				elseif (false != $diff = array_diff(
-				array_merge(get_declared_classes(), get_declared_interfaces()), $state))
-				foreach ($diff as $autoLoaded)
+				if ($this->exists($className, $file)) {
+								$this->alias($className, $currentClass);
+				} elseif (false != $diff = array_diff(
+				array_merge(get_declared_classes(), get_declared_interfaces()), $state)) {
+								foreach ($diff as $autoLoaded)
 					if ($this->exists($autoLoaded, $file))
 						if (false !== strpos($autoLoaded, $className))
 							$this->alias($autoLoaded, $className);
+				}
 
-				if (!$this->exists($currentClass))
-				$result = false;
+				if (!$this->exists($currentClass)) {
+								$result = false;
+				}
 			}
 
 			return $result;
@@ -395,10 +421,12 @@ 
 		private function exists($className, $mapping = null)
 		{
 			if (class_exists($className, false)
-			|| interface_exists($className, false))
-			if (isset($mapping))
+			|| interface_exists($className, false)) {
+						if (isset($mapping))
 				return static::seen($className, $mapping);
-			else return true;
+			} else {
+				return true;
+			}
 			return false;
 		}
 
@@ -411,22 +439,27 @@ 
 		 */
 		public function __invoke($className)
 		{
-			if (empty($className))
-			return false;
+			if (empty($className)) {
+						return false;
+			}
 
-			if (false !== $includeReference = $this->discover($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->discover($className)) {
+						return $includeReference;
+			}
 
 			static::thereCanBeOnlyOne();
 
-			if (false !== $includeReference = $this->loadAliases($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadAliases($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadPrefixes($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadPrefixes($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadLastResort($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadLastResort($className)) {
+						return $includeReference;
+			}
 
 			static::seen($className, true);
 			return null;

htdocs/comm/action/class/cactioncomm.class.php

Braces +9 added lines, -3 removed lines

@@ -327,10 +327,16 @@
 				}
 			}
 
-			if (empty($idorcode)) $idorcode = 'all';
+			if (empty($idorcode)) {
+				$idorcode = 'all';
+			}
 			$TType = $TSystem[$idorcode];
-			if (! empty($TSystemAuto[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
-			if (! empty($TModule[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			if (! empty($TSystemAuto[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
+			}
+			if (! empty($TModule[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			}
 			$this->liste_array = $TType;