Dolibarr / dolibarr

dev/tools/test/namespacemig/bbb.class.php

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		global $globalaaa, $globalbbb;
+	}
 		echo 'dobbb'."\n";
 		$globalaaa.='+bbb';
 		$globalbbb.='+bbb';

dev/tools/test/namespacemig/aaa.class.php

Braces +3 added lines, -1 removed lines

@@ -27,8 +27,10 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		echo 'doaaa'."\n";
 	}
+	}
 }

htdocs/includes/odtphp/zip/PclZipProxy.php

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if (! defined('ODTPHP_PATHTOPCLZIP')) define('ODTPHP_PATHTOPCLZIP','pclzip/');
+if (! defined('ODTPHP_PATHTOPCLZIP')) {
+	define('ODTPHP_PATHTOPCLZIP','pclzip/');
+}
 require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php';
 require_once 'ZipInterface.php';
 class PclZipProxyException extends Exception
@@ -32,7 +34,10 @@ 
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) {
+			$this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);
+		}
+		// $this->tmpdir must not contains / at the end
 	}
 
 	/**

htdocs/includes/odtphp/Segment.php

Braces +12 added lines, -4 removed lines

@@ -88,10 +88,16 @@ 
 	{
 		// To provide debug information on line number processed
 		global $count;
-		if (empty($count)) $count=1;
-		else $count++;
+		if (empty($count)) {
+			$count=1;
+		} else {
+			$count++;
+		}
 
-		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		if (empty($this->savxml)) {
+			$this->savxml = $this->xml;
+		}
+		// Sav content of line at first line merged, so we will reuse original for next steps
 		$this->xml = $this->savxml;
 		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
@@ -123,7 +129,9 @@ 
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+					if (!empty($match[3])) {
+						$this->xml = str_replace($match[0], $match[3], $this->xml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->xml = preg_replace($reg, '', $this->xml);

htdocs/includes/restler/framework/Luracast/Restler/Data/Text.php

Braces +6 added lines, -3 removed lines

@@ -25,8 +25,9 @@ 
 	 */
 	public static function contains($haystack, $needle, $caseSensitive = true)
 	{
-		if (empty($needle))
-			return true;
+		if (empty($needle)) {
+					return true;
+		}
 			return $caseSensitive
 			? strpos($haystack, $needle) !== false
 			: stripos($haystack, $needle) !== false;
@@ -62,7 +63,9 @@ 
 		}
 		
 		// @CHANGE LDR
-		if (!is_string($haystack)) return false;
+		if (!is_string($haystack)) {
+			return false;
+		}
 		
 		return (substr($haystack, -$length) === $needle);
 	}

htdocs/includes/restler/framework/Luracast/Restler/Data/Arr.php

Braces +7 added lines, -3 removed lines

@@ -25,9 +25,13 @@
     {
         $copy = array();
         foreach ($arr as $key => $value) {
-            if (is_array($value)) $copy[$key] = static::copy($value);
-            else if (is_object($value)) $copy[$key] = clone $value;
-            else $copy[$key] = $value;
+            if (is_array($value)) {
+            	$copy[$key] = static::copy($value);
+            } else if (is_object($value)) {
+            	$copy[$key] = clone $value;
+            } else {
+            	$copy[$key] = $value;
+            }
         }
         return $copy;
     }

htdocs/includes/restler/framework/Luracast/Restler/Data/Validator.php

Braces +3 added lines, -1 removed lines

@@ -549,7 +549,9 @@
                 case 'string' :
                 case 'password' : //password fields with string
                 case 'search' : //search field with string
-                    if (is_bool($input)) $input = $input ? 'true' : 'false';
+                    if (is_bool($input)) {
+                    	$input = $input ? 'true' : 'false';
+                    }
                     if (!is_string($input)) {
                         $error .= '. Expecting alpha numeric value';
                         break;

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

Braces +33 added lines, -20 removed lines

@@ -231,8 +231,9 @@ 
                 }
                 $fLen = strlen($fullPath);
                 if ($tSlash) {
-                    if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/'))
-                        continue;
+                    if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/')) {
+                                            continue;
+                    }
                 } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) {
                     //when mapped to root exclude paths that have static parts
                     //they are listed else where under that static part name
@@ -244,8 +245,9 @@ 
                 }
                 foreach (static::$excludedPaths as $exclude) {
                     if (empty($exclude)) {
-                        if ($fullPath == $exclude)
-                            continue 2;
+                        if ($fullPath == $exclude) {
+                                                    continue 2;
+                        }
                     } elseif (Text::beginsWith($fullPath, $exclude)) {
                         continue 2;
                     }
@@ -283,8 +285,9 @@ 
                 }
                 $nickname = $this->_nickname($route);
                 $index = static::$placeFormatExtensionBeforeDynamicParts && $pos > 0 ? $pos : 0;
-                if (!empty($parts[$index]))
-                    $parts[$index] .= $this->formatString;
+                if (!empty($parts[$index])) {
+                                    $parts[$index] .= $this->formatString;
+                }
 
                 $fullPath = implode('/', $parts);
                 $description = isset(
@@ -388,8 +391,9 @@ 
         if (!$count) {
             throw new RestException(404);
         }
-        if (!is_null($r))
-            $r->models = $this->_models;
+        if (!is_null($r)) {
+                    $r->models = $this->_models;
+        }
         usort(
             $r->apis,
             function ($a, $b) {
@@ -681,8 +685,9 @@ 
             // Create default object that includes parameters to be submitted
             $defaultObject = new \StdClass();
             foreach ($this->_bodyParam['names'] as $name => $values) {
-                if (!$values->required)
-                    continue;
+                if (!$values->required) {
+                                    continue;
+                }
                 if (class_exists($values->dataType)) {
                     $myClassName = $values->dataType;
                     $defaultObject->$name = new $myClassName();
@@ -706,8 +711,9 @@ 
         }
         $properties = array();
         if (!$instance) {
-            if (!class_exists($className))
-                return;
+            if (!class_exists($className)) {
+                            return;
+            }
             $instance = new $className();
         }
         $data = get_object_vars($instance);
@@ -828,8 +834,12 @@ 
             }
             return 'array';
         }
-        if (is_bool($o)) return 'boolean';
-        if (is_numeric($o)) return is_float($o) ? 'float' : 'int';
+        if (is_bool($o)) {
+        	return 'boolean';
+        }
+        if (is_numeric($o)) {
+        	return is_float($o) ? 'float' : 'int';
+        }
         return 'string';
     }
 
@@ -879,8 +889,9 @@ 
      */
     public function index()
     {
-        if (!static::$accessControlFunction && Defaults::$accessControlFunction)
-            static::$accessControlFunction = Defaults::$accessControlFunction;
+        if (!static::$accessControlFunction && Defaults::$accessControlFunction) {
+                    static::$accessControlFunction = Defaults::$accessControlFunction;
+        }
         $version = $this->restler->getRequestedApiVersion();
         $allRoutes = Util::nestedValue(Routes::toArray(), "v$version");
         $r = $this->_resourceListing();
@@ -934,8 +945,9 @@ 
         foreach ($allRoutes as $fullPath => $routes) {
             $path = explode('/', $fullPath);
             $resource = isset($path[0]) ? $path[0] : '';
-            if ($resource == 'resources' || Text::endsWith($resource, 'index'))
-                continue;
+            if ($resource == 'resources' || Text::endsWith($resource, 'index')) {
+                            continue;
+            }
             foreach ($routes as $httpMethod => $route) {
                 if (in_array($httpMethod, static::$excludedHttpMethods)) {
                     continue;
@@ -946,8 +958,9 @@ 
 
                 foreach (static::$excludedPaths as $exclude) {
                     if (empty($exclude)) {
-                        if ($fullPath == $exclude)
-                            continue 2;
+                        if ($fullPath == $exclude) {
+                                                    continue 2;
+                        }
                     } elseif (Text::beginsWith($fullPath, $exclude)) {
                         continue 2;
                     }

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

Braces +66 added lines, -45 removed lines

@@ -284,8 +284,9 @@ 
                     $this->route();
                     throw $e;
                 }
-                if (Defaults::$useVendorMIMEVersioning)
-                    $this->responseFormat = $this->negotiateResponseFormat();
+                if (Defaults::$useVendorMIMEVersioning) {
+                                    $this->responseFormat = $this->negotiateResponseFormat();
+                }
                 $this->route();
             } catch (Exception $e) {
                 $this->negotiate();
@@ -401,9 +402,10 @@ 
 
             $obj = Scope::get($className);
 
-            if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+            if (!$obj instanceof iFormat) {
+                            throw new Exception('Invalid format class; must implement ' .
                     'iFormat interface');
+            }
             if ($throwException && get_class($obj) == get_class($this->requestFormat)) {
                 $throwException = false;
             }
@@ -413,12 +415,15 @@ 
                     $this->writableMimeTypes[]=$mime;
                     $extensions[".$extension"] = true;
                 }
-                if($obj->isReadable())
-                    $this->readableMimeTypes[]=$mime;
-                if (!isset($this->formatMap[$extension]))
-                    $this->formatMap[$extension] = $className;
-                if (!isset($this->formatMap[$mime]))
-                    $this->formatMap[$mime] = $className;
+                if($obj->isReadable()) {
+                                    $this->readableMimeTypes[]=$mime;
+                }
+                if (!isset($this->formatMap[$extension])) {
+                                    $this->formatMap[$extension] = $className;
+                }
+                if (!isset($this->formatMap[$mime])) {
+                                    $this->formatMap[$mime] = $className;
+                }
             }
         }
         if ($throwException) {
@@ -449,17 +454,21 @@ 
 
             $obj = Scope::get($className);
 
-            if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+            if (!$obj instanceof iFormat) {
+                            throw new Exception('Invalid format class; must implement ' .
                     'iFormat interface');
+            }
 
             foreach ($obj->getMIMEMap() as $mime => $extension) {
-                if (!isset($this->formatOverridesMap[$extension]))
-                    $this->formatOverridesMap[$extension] = $className;
-                if (!isset($this->formatOverridesMap[$mime]))
-                    $this->formatOverridesMap[$mime] = $className;
-                if($obj->isWritable())
-                    $extensions[".$extension"] = true;
+                if (!isset($this->formatOverridesMap[$extension])) {
+                                    $this->formatOverridesMap[$extension] = $className;
+                }
+                if (!isset($this->formatOverridesMap[$mime])) {
+                                    $this->formatOverridesMap[$mime] = $className;
+                }
+                if($obj->isWritable()) {
+                                    $extensions[".$extension"] = true;
+                }
             }
         }
         $this->formatOverridesMap['extensions'] = array_keys($extensions);
@@ -498,9 +507,10 @@ 
     protected function getPath()
     {
         // fix SCRIPT_NAME for PHP 5.4 built-in web server
-        if (false === strpos($_SERVER['SCRIPT_NAME'], '.php'))
-            $_SERVER['SCRIPT_NAME']
+        if (false === strpos($_SERVER['SCRIPT_NAME'], '.php')) {
+                    $_SERVER['SCRIPT_NAME']
                 = '/' . substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']) + 1);
+        }
 
         list($base, $path) = Util::splitCommonPath(
             strtok(urldecode($_SERVER['REQUEST_URI']), '?'), //remove query string
@@ -521,8 +531,9 @@ 
                 (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') || // Amazon ELB
                 (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on');
             $baseUrl = ($https ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'];
-            if (!$https && $port != '80' || $https && $port != '443')
-                $baseUrl .= ':' . $port;
+            if (!$https && $port != '80' || $https && $port != '443') {
+                            $baseUrl .= ':' . $port;
+            }
             $this->baseUrl = $baseUrl . $base;
         } elseif (!empty($base) && false === strpos($this->baseUrl, $base)) {
             $this->baseUrl .= $base;
@@ -572,9 +583,9 @@ 
             if (false !== $pos = strpos($mime, ';')) {
                 $mime = substr($mime, 0, $pos);
             }
-            if ($mime == UrlEncodedFormat::MIME)
-                $format = Scope::get('UrlEncodedFormat');
-            elseif (isset($this->formatMap[$mime])) {
+            if ($mime == UrlEncodedFormat::MIME) {
+                            $format = Scope::get('UrlEncodedFormat');
+            } elseif (isset($this->formatMap[$mime])) {
                 $format = Scope::get($this->formatMap[$mime]);
                 $format->setMIME($mime);
             } elseif (!$this->requestFormatDiffered && isset($this->formatOverridesMap[$mime])) {
@@ -630,8 +641,9 @@ 
             }
 
             $stream = $this->getRequestStream();
-            if($stream === FALSE)
-                return array();
+            if($stream === FALSE) {
+                            return array();
+            }
             $r = $this->requestFormat instanceof iDecodeStream
                 ? $this->requestFormat->decodeStream($stream)
                 : $this->requestFormat->decode(stream_get_contents($stream));
@@ -673,8 +685,9 @@ 
                 }
             }
         }
-        if (!isset($o->className))
-            throw new RestException(404);
+        if (!isset($o->className)) {
+                    throw new RestException(404);
+        }
 
         if(isset($this->apiVersionMap[$o->className])){
             Scope::$classAliases[Util::getShortName($o->className)]
@@ -715,13 +728,15 @@ 
             $this->requestMethod == 'OPTIONS'
             && Defaults::$crossOriginResourceSharing
         ) {
-            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
-                header('Access-Control-Allow-Methods: '
+            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD'])) {
+                            header('Access-Control-Allow-Methods: '
                     . Defaults::$accessControlAllowMethods);
+            }
 
-            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
-                header('Access-Control-Allow-Headers: '
+            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
+                            header('Access-Control-Allow-Headers: '
                     . $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+            }
 
             header('Access-Control-Allow-Origin: ' .
                 ((Defaults::$accessControlAllowOrigin == '*' && isset($_SERVER['HTTP_ORIGIN']))
@@ -755,11 +770,12 @@ 
             $formats = explode(',', (string)$metadata['format']);
             foreach ($formats as $i => $f) {
                 $f = trim($f);
-                if (!in_array($f, $this->formatOverridesMap))
-                    throw new RestException(
+                if (!in_array($f, $this->formatOverridesMap)) {
+                                    throw new RestException(
                         500,
                         "Given @format is not present in overriding formats. Please call `\$r->setOverridingFormats('$f');` first."
                     );
+                }
                 $formats[$i] = $f;
             }
             call_user_func_array(array($this, 'setSupportedFormats'), $formats);
@@ -1032,8 +1048,9 @@ 
                 }
                 $valid = $o->parameters[$index];
                 $o->parameters[$index] = null;
-                if (empty(Validator::$exceptions))
-                    $o->metadata['param'][$index]['autofocus'] = true;
+                if (empty(Validator::$exceptions)) {
+                                    $o->metadata['param'][$index]['autofocus'] = true;
+                }
                 $valid = $validator::validate(
                     $valid, $info
                 );
@@ -1049,8 +1066,9 @@ 
         $o = & $this->apiMethodInfo;
         $accessLevel = max(Defaults::$apiAccessLevel,
             $o->accessLevel);
-        if (function_exists('newrelic_name_transaction'))
-            newrelic_name_transaction("{$o->className}/{$o->methodName}");
+        if (function_exists('newrelic_name_transaction')) {
+                    newrelic_name_transaction("{$o->className}/{$o->methodName}");
+        }
         $object =  Scope::get($o->className);
         switch ($accessLevel) {
             case 3 : //protected method
@@ -1094,8 +1112,9 @@ 
     {
         //only GET method should be cached if allowed by API developer
         $expires = $this->requestMethod == 'GET' ? Defaults::$headerExpires : 0;
-        if(!is_array(Defaults::$headerCacheControl))
-            Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        if(!is_array(Defaults::$headerCacheControl)) {
+                    Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        }
         $cacheControl = Defaults::$headerCacheControl[0];
         if ($expires > 0) {
             $cacheControl = $this->apiMethodInfo->accessLevel
@@ -1137,8 +1156,9 @@ 
         @header('Content-Language: ' . Defaults::$language);
 
         if (isset($this->apiMethodInfo->metadata['header'])) {
-            foreach ($this->apiMethodInfo->metadata['header'] as $header)
-                @header($header, true);
+            foreach ($this->apiMethodInfo->metadata['header'] as $header) {
+                            @header($header, true);
+            }
         }
         $code = 200;
         if (!Defaults::$suppressResponseCode) {
@@ -1202,8 +1222,9 @@ 
         foreach ($this->errorClasses as $className) {
             if (method_exists($className, $method)) {
                 $obj = Scope::get($className);
-                if ($obj->$method($exception))
-                    $handled = true;
+                if ($obj->$method($exception)) {
+                                    $handled = true;
+                }
             }
         }
         if ($handled) {