Dolibarr / dolibarr

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

Spacing +22 added lines, -22 removed lines

@@ -188,7 +188,7 @@ 
         if (is_numeric($input) && '-' != substr($input, 0, 1)) {
             return $input;
         }
-        throw new Invalid('Expecting phone number, a numeric value ' .
+        throw new Invalid('Expecting phone number, a numeric value '.
             'with optional `+` prefix');
     }
 
@@ -284,7 +284,7 @@ 
         }
         throw new Invalid(
             'Expecting date in `YYYY-MM-DD` format, such as `'
-            . date("Y-m-d") . '`'
+            . date("Y-m-d").'`'
         );
     }
 
@@ -302,8 +302,8 @@ 
     public static function datetime($input, ValidationInfo $info = null)
     {
         if (
-            preg_match('/^(?P<year>19\d\d|20\d\d)\-(?P<month>0[1-9]|1[0-2])\-' .
-                '(?P<day>0\d|[1-2]\d|3[0-1]) (?P<h>0\d|1\d|2[0-3]' .
+            preg_match('/^(?P<year>19\d\d|20\d\d)\-(?P<month>0[1-9]|1[0-2])\-'.
+                '(?P<day>0\d|[1-2]\d|3[0-1]) (?P<h>0\d|1\d|2[0-3]'.
                 ')\:(?P<i>[0-5][0-9])\:(?P<s>[0-5][0-9])$/',
                 $input, $date)
             && checkdate($date['month'], $date['day'], $date['year'])
@@ -312,7 +312,7 @@ 
         }
         throw new Invalid(
             'Expecting date and time in `YYYY-MM-DD HH:MM:SS` format, such as `'
-            . date("Y-m-d H:i:s") . '`'
+            . date("Y-m-d H:i:s").'`'
         );
     }
 
@@ -350,7 +350,7 @@ 
         }
         throw new Invalid(
             'Expecting time in `HH:MM:SS` format, such as `'
-            . date("H:i:s") . '`'
+            . date("H:i:s").'`'
         );
     }
 
@@ -391,13 +391,13 @@ 
      */
     public static function timestamp($input, ValidationInfo $info = null)
     {
-        if ((string)(int)$input == $input
+        if ((string) (int) $input == $input
             && ($input <= PHP_INT_MAX)
             && ($input >= ~PHP_INT_MAX)
         ) {
-            return (int)$input;
+            return (int) $input;
         }
-        throw new Invalid('Expecting unix timestamp, such as ' . time());
+        throw new Invalid('Expecting unix timestamp, such as '.time());
     }
 
     /**
@@ -433,7 +433,7 @@ 
         try {
             if (is_null($input)) {
                 if ($info->required) {
-                    throw new RestException (400,
+                    throw new RestException(400,
                         "$name is required.");
                 }
                 return null;
@@ -465,7 +465,7 @@ 
                         // just continue
                     }
                 }
-                throw new RestException (400, $error);
+                throw new RestException(400, $error);
             }
 
             //patterns are supported only for non numeric types
@@ -475,7 +475,7 @@ 
                 && $info->type != 'number'
             ) {
                 if (!preg_match($info->pattern, $input)) {
-                    throw new RestException (400, $error);
+                    throw new RestException(400, $error);
                 }
             }
 
@@ -486,13 +486,13 @@ 
                 } elseif (is_array($input)) {
                     foreach ($input as $i) {
                         if (!in_array($i, $info->choice)) {
-                            $error .= ". Expected one of (" . implode(',', $info->choice) . ").";
-                            throw new RestException (400, $error);
+                            $error .= ". Expected one of (".implode(',', $info->choice).").";
+                            throw new RestException(400, $error);
                         }
                     }
                 } elseif (!in_array($input, $info->choice)) {
-                    $error .= ". Expected one of (" . implode(',', $info->choice) . ").";
-                    throw new RestException (400, $error);
+                    $error .= ". Expected one of (".implode(',', $info->choice).").";
+                    throw new RestException(400, $error);
                 }
             }
 
@@ -504,7 +504,7 @@ 
                 try {
                     return call_user_func("$class::$info->type", $input, $info);
                 } catch (Invalid $e) {
-                    throw new RestException(400, $error . '. ' . $e->getMessage());
+                    throw new RestException(400, $error.'. '.$e->getMessage());
                 }
             }
 
@@ -518,9 +518,9 @@ 
                             . ' value';
                         break;
                     }
-                    if ($info->type == 'int' && (int)$input != $input) {
+                    if ($info->type == 'int' && (int) $input != $input) {
                         if ($info->fix) {
-                            $r = (int)$input;
+                            $r = (int) $input;
                         } else {
                             $error .= '. Expecting integer value';
                             break;
@@ -663,7 +663,7 @@ 
                         }
                         return $input;
                     } elseif (isset($contentType)) {
-                        $error .= '. Expecting items of type ' .
+                        $error .= '. Expecting items of type '.
                             ($html ? "<strong>$contentType</strong>" : "`$contentType`");
                         break;
                     }
@@ -697,7 +697,7 @@ 
                                 !is_array($input) ||
                                 $input === array_values($input)
                             ) {
-                                $error .= '. Expecting an item of type ' .
+                                $error .= '. Expecting an item of type '.
                                     ($html ? "<strong>$info->type</strong>" : "`$info->type`");
                                 break;
                             }
@@ -715,7 +715,7 @@ 
                         return $instance;
                     }
             }
-            throw new RestException (400, $error);
+            throw new RestException(400, $error);
         } catch (\Exception $e) {
             static::$exceptions[$info->name] = $e;
             if (static::$holdException) {

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

Spacing +4 added lines, -4 removed lines

@@ -172,8 +172,8 @@ 
 
     public static function numericValue($value)
     {
-        return ( int )$value == $value
-            ? ( int )$value
+        return (int) $value == $value
+            ? (int) $value
             : floatval($value);
     }
 
@@ -188,7 +188,7 @@ 
     {
         return is_array($value)
             ? implode($glue, $value)
-            : ( string )$value;
+            : (string) $value;
     }
 
     public static function booleanValue($value)
@@ -266,7 +266,7 @@ 
      */
     public static function __set_state(array $info)
     {
-        $o = new self ($info);
+        $o = new self($info);
         return $o;
     }
 }

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

Spacing +26 added lines, -27 removed lines

@@ -150,7 +150,7 @@ 
     public function _pre_get_json($id)
     {
         $userClass = Defaults::$userIdentifierClass;
-        $this->cacheName = $userClass::getCacheIdentifier() . '_resources_' . $id;
+        $this->cacheName = $userClass::getCacheIdentifier().'_resources_'.$id;
         if ($this->restler->getProductionMode()
             && !$this->restler->refreshCache
             && $this->restler->cache->isCached($this->cacheName)
@@ -216,7 +216,7 @@ 
 
         $routes
             = Util::nestedValue(Routes::toArray(), "v$version")
-            ? : array();
+            ?: array();
 
         $prefix = Defaults::$useUrlBasedVersioning ? "/v$version" : '';
 
@@ -231,7 +231,7 @@ 
                 }
                 $fLen = strlen($fullPath);
                 if ($tSlash) {
-                    if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/'))
+                    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
@@ -290,21 +290,21 @@ 
                 $description = isset(
                 $m['classDescription'])
                     ? $m['classDescription']
-                    : $className . ' API';
+                    : $className.' API';
                 if (empty($m['description'])) {
                     $m['description'] = $this->restler->getProductionMode()
                         ? ''
                         : 'routes to <mark>'
                         . $route['className']
                         . '::'
-                        . $route['methodName'] . '();</mark>';
+                        . $route['methodName'].'();</mark>';
                 }
                 if (empty($m['longDescription'])) {
                     $m['longDescription'] = $this->restler->getProductionMode()
                         ? ''
                         : 'Add PHPDoc long description to '
                         . "<mark>$className::"
-                        . $route['methodName'] . '();</mark>'
+                        . $route['methodName'].'();</mark>'
                         . '  (the api method) to write here';
                 }
                 $operation = $this->_operation(
@@ -359,8 +359,8 @@ 
                                 ['type'];
                                 if (class_exists($rt)) {
                                     $this->_model($rt);
-                                    $operation->responseClass .= '[' .
-                                        $this->_noNamespace($rt) . ']';
+                                    $operation->responseClass .= '['.
+                                        $this->_noNamespace($rt).']';
                                 }
                             }
                         }
@@ -392,7 +392,7 @@ 
             $r->models = $this->_models;
         usort(
             $r->apis,
-            function ($a, $b) {
+            function($a, $b) {
                 $order = array(
                     'GET' => 1,
                     'POST' => 2,
@@ -450,7 +450,7 @@ 
     protected function _resourceListing()
     {
         $r = new stdClass();
-        $r->apiVersion = (string)$this->restler->_requestedApiVersion;
+        $r->apiVersion = (string) $this->restler->_requestedApiVersion;
         $r->swaggerVersion = "1.1";
         $r->basePath = $this->restler->getBaseUrl();
         $r->produces = $this->restler->getWritableMimeTypes();
@@ -493,7 +493,7 @@ 
 
         $r->parameters = array();
 
-        $r->summary = $summary . ($route['accessLevel'] > 2
+        $r->summary = $summary.($route['accessLevel'] > 2
                 ? static::$apiDescriptionSuffixSymbols[2]
                 : static::$apiDescriptionSuffixSymbols[$route['accessLevel']]
             );
@@ -508,13 +508,13 @@ 
         $r = new stdClass();
         $r->name = $param['name'];
         $r->description = !empty($param['description'])
-            ? $param['description'] . '.'
+            ? $param['description'].'.'
             : ($this->restler->getProductionMode()
                 ? ''
-                : 'add <mark>@param {type} $' . $r->name
+                : 'add <mark>@param {type} $'.$r->name
                 . ' {comment}</mark> to describe here');
         //paramType can be path or query or body or header
-        $r->paramType = Util::nestedValue($param, CommentParser::$embeddedDataName, 'from') ? : 'query';
+        $r->paramType = Util::nestedValue($param, CommentParser::$embeddedDataName, 'from') ?: 'query';
         $r->required = isset($param['required']) && $param['required'];
         if (isset($param['default'])) {
             $r->defaultValue = $param['default'];
@@ -583,7 +583,7 @@ 
         }
         $this->_bodyParam['description'][$p->name]
             = "$p->name"
-            . ' : <tag>' . $p->dataType . '</tag> '
+            . ' : <tag>'.$p->dataType.'</tag> '
             . ($p->required ? ' <i>(required)</i> - ' : ' - ')
             . $p->description;
         $this->_bodyParam['required'] = $p->required
@@ -609,9 +609,9 @@ 
                         . (count($a) > 1 ? ' properties.' : ' property.');
                     foreach ($a as $k => $v) {
                         $r->description .= "<hr/>$k : <tag>"
-                            . $v['type'] . '</tag> '
+                            . $v['type'].'</tag> '
                             . (isset($v['required']) ? '(required)' : '')
-                            . ' - ' . $v['description'];
+                            . ' - '.$v['description'];
                     }
                 }
                 $r->defaultValue = "{\n    \""
@@ -631,9 +631,9 @@ 
                             . (count($a) > 1 ? ' properties.' : ' property.');
                         foreach ($a as $k => $v) {
                             $r->description .= "<hr/>$k : <tag>"
-                                . $v['type'] . '</tag> '
+                                . $v['type'].'</tag> '
                                 . (isset($v['required']) ? '(required)' : '')
-                                . ' - ' . $v['description'];
+                                . ' - '.$v['description'];
                         }
                     }
                     $r->defaultValue = "[\n    {\n        \""
@@ -734,11 +734,11 @@ 
                 $type = Util::nestedValue(
                     $propertyMetaData,
                     'type'
-                ) ? : $this->getType($value, true);
+                ) ?: $this->getType($value, true);
                 $description = Util::nestedValue(
                     $propertyMetaData,
                     'description'
-                ) ? : '';
+                ) ?: '';
 
                 if (class_exists($type)) {
                     $this->_model($type);
@@ -766,8 +766,7 @@ 
                     $propertyMetaData,
                     CommentParser::$embeddedDataName,
                     'type'
-                ) ? :
-                    (count($value)
+                ) ?: (count($value)
                         ? $this->getType(end($value), true)
                         : 'string');
                 if (class_exists($itemType)) {
@@ -894,7 +893,7 @@ 
             if (!Text::contains($path, '{')) {
                 //add id
                 $r->apis[] = array(
-                    'path' => $path . $this->formatString,
+                    'path' => $path.$this->formatString,
                     'description' => $description
                 );
             }
@@ -915,8 +914,8 @@ 
 
     protected function _loadResource($url)
     {
-        $ch = curl_init($this->restler->getBaseUrl() . $url
-            . (empty($_GET) ? '' : '?' . http_build_query($_GET)));
+        $ch = curl_init($this->restler->getBaseUrl().$url
+            . (empty($_GET) ? '' : '?'.http_build_query($_GET)));
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
         curl_setopt($ch, CURLOPT_TIMEOUT, 15);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -925,7 +924,7 @@ 
         ));
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);        
         $result = json_decode(curl_exec($ch));
-        $http_status = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $http_status = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
         return array($http_status, $result);
     }
 

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

Spacing +6 added lines, -6 removed lines

@@ -80,12 +80,12 @@ 
      */
     public static function register($name, $function, $singleton = true)
     {
-        static::$registry[$name] = (object)compact('function', 'singleton');
+        static::$registry[$name] = (object) compact('function', 'singleton');
     }
 
     public static function set($name, $instance)
     {
-        static::$instances[$name] = (object)array('instance' => $instance);
+        static::$instances[$name] = (object) array('instance' => $instance);
     }
 
     public static function get($name)
@@ -100,7 +100,7 @@ 
             $function = static::$registry[$name]->function;
             $r = $function();
             if (static::$registry[$name]->singleton) {
-                static::$instances[$name] = (object)array('instance' => $r);
+                static::$instances[$name] = (object) array('instance' => $r);
             }
         } elseif (is_callable(static::$resolver) && false === stristr($name, 'Luracast\Restler')) {
             $fullName = $name;
@@ -110,7 +110,7 @@ 
             /** @var Callable $function */
             $function = static::$resolver;
             $r = $function($fullName);
-            static::$instances[$name] = (object)array('instance' => $r);
+            static::$instances[$name] = (object) array('instance' => $r);
             static::$instances[$name]->initPending = true;
         } else {
             $fullName = $name;
@@ -120,7 +120,7 @@ 
             if (class_exists($fullName)) {
                 $shortName = Util::getShortName($name);
                 $r = new $fullName();
-                static::$instances[$name] = (object)array('instance' => $r);
+                static::$instances[$name] = (object) array('instance' => $r);
                 if ($name != 'Restler') {
                     /** @var Restler restler */
                     $r->restler = static::get('Restler');
@@ -210,7 +210,7 @@ 
         } elseif (array_key_exists($className, $scope)) {
             $qualified = $scope[$className];
         } else {
-            $qualified = $scope['*'] . $className;
+            $qualified = $scope['*'].$className;
         }
         if (class_exists($qualified)) {
             return $qualified;

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

Spacing +7 added lines, -7 removed lines

@@ -80,10 +80,10 @@ 
     public function __construct($httpStatusCode, $errorMessage = null, array $details = array(), Exception $previous = null)
     {
         $events = Scope::get('Restler')->getEvents();
-        if(count($events)<= 1){
+        if (count($events) <= 1) {
             $this->stage = 'setup';
         } else {
-            $this->stage = $previous ? $events[count($events)-2] : end($events);
+            $this->stage = $previous ? $events[count($events) - 2] : end($events);
         }
         $this->details = $details;
         parent::__construct($errorMessage, $httpStatusCode, $previous);
@@ -119,8 +119,8 @@ 
         $statusCode = $this->getCode();
         $message = $this->getMessage();
         if (isset(RestException::$codes[$statusCode])) {
-            $message = RestException::$codes[$statusCode] .
-                (empty($message) ? '' : ': ' . $message);
+            $message = RestException::$codes[$statusCode].
+                (empty($message) ? '' : ': '.$message);
         }
         return $message;
     }
@@ -131,9 +131,9 @@ 
         while ($e->getPrevious()) {
             $e = $e->getPrevious();
         }
-        return basename($e->getFile()) . ':'
-        . $e->getLine() . ' at '
-        . $this->getStage() . ' stage';
+        return basename($e->getFile()).':'
+        . $e->getLine().' at '
+        . $this->getStage().' stage';
     }
 }
 

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

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
      *
      * @return mixed
      */
-    public function __setAuthenticationStatus($isAuthenticated=false);
+    public function __setAuthenticationStatus($isAuthenticated = false);
 }
 

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

Spacing +5 added lines, -6 removed lines

@@ -63,9 +63,8 @@ 
         function_exists('memcache_set') || $this->memcacheNotAvailable();
 
         try {
-            return $this->memcache->set(self::$namespace . "-" . $name, $data);
-        } catch
-        (\Exception $exception) {
+            return $this->memcache->set(self::$namespace."-".$name, $data);
+        } catch (\Exception $exception) {
             return false;
         }
     }
@@ -90,7 +89,7 @@ 
         function_exists('memcache_get') || $this->memcacheNotAvailable();
 
         try {
-            return $this->memcache->get(self::$namespace . "-" . $name);
+            return $this->memcache->get(self::$namespace."-".$name);
         } catch (\Exception $exception) {
             if (!$ignoreErrors) {
                 throw $exception;
@@ -114,7 +113,7 @@ 
         function_exists('memcache_delete') || $this->memcacheNotAvailable();
 
         try {
-            $this->memcache->delete(self::$namespace . "-" . $name);
+            $this->memcache->delete(self::$namespace."-".$name);
         } catch (\Exception $exception) {
             if (!$ignoreErrors) {
                 throw $exception;
@@ -133,7 +132,7 @@ 
     public function isCached($name)
     {
         function_exists('memcache_get') || $this->memcacheNotAvailable();
-        $data = $this->memcache->get(self::$namespace . "-" . $name);
+        $data = $this->memcache->get(self::$namespace."-".$name);
         return !empty($data);
     }
 

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

Spacing +60 added lines, -61 removed lines

@@ -110,7 +110,7 @@ 
      *
      * @var int|null when specified it will override @status comment
      */
-    public $responseCode=null;
+    public $responseCode = null;
     /**
      * @var string base url of the api service
      */
@@ -246,8 +246,8 @@ 
         Scope::set('Restler', $this);
         $this->productionMode = $productionMode;
         if (is_null(Defaults::$cacheDirectory)) {
-            Defaults::$cacheDirectory = dirname($_SERVER['SCRIPT_FILENAME']) .
-                DIRECTORY_SEPARATOR . 'cache';
+            Defaults::$cacheDirectory = dirname($_SERVER['SCRIPT_FILENAME']).
+                DIRECTORY_SEPARATOR.'cache';
         }
         $this->cache = new Defaults::$cacheClass();
         $this->refreshCache = $refreshCache;
@@ -313,7 +313,7 @@ 
             }
             $this->respond();
         } catch (Exception $e) {
-            try{
+            try {
                 if (Defaults::$returnResponse) {
                     return $this->message($e);
                 }
@@ -402,19 +402,19 @@ 
             $obj = Scope::get($className);
 
             if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+                throw new Exception('Invalid format class; must implement '.
                     'iFormat interface');
             if ($throwException && get_class($obj) == get_class($this->requestFormat)) {
                 $throwException = false;
             }
 
             foreach ($obj->getMIMEMap() as $mime => $extension) {
-                if($obj->isWritable()){
-                    $this->writableMimeTypes[]=$mime;
+                if ($obj->isWritable()) {
+                    $this->writableMimeTypes[] = $mime;
                     $extensions[".$extension"] = true;
                 }
-                if($obj->isReadable())
-                    $this->readableMimeTypes[]=$mime;
+                if ($obj->isReadable())
+                    $this->readableMimeTypes[] = $mime;
                 if (!isset($this->formatMap[$extension]))
                     $this->formatMap[$extension] = $className;
                 if (!isset($this->formatMap[$mime]))
@@ -424,7 +424,7 @@ 
         if ($throwException) {
             throw new RestException(
                 403,
-                'Content type `' . $this->requestFormat->getMIME() . '` is not supported.'
+                'Content type `'.$this->requestFormat->getMIME().'` is not supported.'
             );
         }
         $this->formatMap['default'] = $args[0];
@@ -450,7 +450,7 @@ 
             $obj = Scope::get($className);
 
             if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+                throw new Exception('Invalid format class; must implement '.
                     'iFormat interface');
 
             foreach ($obj->getMIMEMap() as $mime => $extension) {
@@ -458,7 +458,7 @@ 
                     $this->formatOverridesMap[$extension] = $className;
                 if (!isset($this->formatOverridesMap[$mime]))
                     $this->formatOverridesMap[$mime] = $className;
-                if($obj->isWritable())
+                if ($obj->isWritable())
                     $extensions[".$extension"] = true;
             }
         }
@@ -477,7 +477,7 @@ 
     {
         if (func_num_args() > 1) {
             $urls = func_get_args();
-            usort($urls, function ($a, $b) {
+            usort($urls, function($a, $b) {
                 return strlen($a) - strlen($b);
             });
             foreach ($urls as $u) {
@@ -500,7 +500,7 @@ 
         // fix SCRIPT_NAME for PHP 5.4 built-in web server
         if (false === strpos($_SERVER['SCRIPT_NAME'], '.php'))
             $_SERVER['SCRIPT_NAME']
-                = '/' . substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']) + 1);
+                = '/'.substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']) + 1);
 
         list($base, $path) = Util::splitCommonPath(
             strtok(urldecode($_SERVER['REQUEST_URI']), '?'), //remove query string
@@ -510,9 +510,9 @@ 
         if (!$this->baseUrl) {
             // Fix port number retrieval if port is specified in HOST header.
             $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
-            $portPos = strpos($host,":");
-            if ($portPos){
-               $port = substr($host,$portPos+1);
+            $portPos = strpos($host, ":");
+            if ($portPos) {
+               $port = substr($host, $portPos + 1);
             } else {
                $port = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : '80';
                $port = isset($_SERVER['HTTP_X_FORWARDED_PORT']) ? $_SERVER['HTTP_X_FORWARDED_PORT'] : $port; // Amazon ELB
@@ -520,10 +520,10 @@ 
             $https = $port == '443' ||
                 (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'];
+            $baseUrl = ($https ? 'https://' : 'http://').$_SERVER['SERVER_NAME'];
             if (!$https && $port != '80' || $https && $port != '443')
-                $baseUrl .= ':' . $port;
-            $this->baseUrl = $baseUrl . $base;
+                $baseUrl .= ':'.$port;
+            $this->baseUrl = $baseUrl.$base;
         } elseif (!empty($base) && false === strpos($this->baseUrl, $base)) {
             $this->baseUrl .= $base;
         }
@@ -559,7 +559,7 @@ 
      */
     protected function getRequestFormat()
     {
-        $format = null ;
+        $format = null;
         // check if client has sent any information on request format
         if (
             !empty($_SERVER['CONTENT_TYPE']) ||
@@ -591,7 +591,7 @@ 
                 );
             }
         }
-        if(!$format){
+        if (!$format) {
             $format = Scope::get($this->formatMap['default']);
         }
         return $format;
@@ -630,7 +630,7 @@ 
             }
 
             $stream = $this->getRequestStream();
-            if($stream === FALSE)
+            if ($stream === FALSE)
                 return array();
             $r = $this->requestFormat instanceof iDecodeStream
                 ? $this->requestFormat->decodeStream($stream)
@@ -676,7 +676,7 @@ 
         if (!isset($o->className))
             throw new RestException(404);
 
-        if(isset($this->apiVersionMap[$o->className])){
+        if (isset($this->apiVersionMap[$o->className])) {
             Scope::$classAliases[Util::getShortName($o->className)]
                 = $this->apiVersionMap[$o->className][$this->requestedApiVersion];
         }
@@ -723,7 +723,7 @@ 
                 header('Access-Control-Allow-Headers: '
                     . $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
 
-            header('Access-Control-Allow-Origin: ' .
+            header('Access-Control-Allow-Origin: '.
                 ((Defaults::$accessControlAllowOrigin == '*' && isset($_SERVER['HTTP_ORIGIN']))
                     ? $_SERVER['HTTP_ORIGIN'] : Defaults::$accessControlAllowOrigin));
             header('Access-Control-Allow-Credentials: true');
@@ -752,7 +752,7 @@ 
         //check if the api method insists on response format using @format comment
 
         if ($metadata && isset($metadata['format'])) {
-            $formats = explode(',', (string)$metadata['format']);
+            $formats = explode(',', (string) $metadata['format']);
             foreach ($formats as $i => $f) {
                 $f = trim($f);
                 if (!in_array($f, $this->formatOverridesMap))
@@ -800,7 +800,7 @@ 
                     if (is_string(Defaults::$apiVendor)
                         && 0 === stripos($mime,
                             'application/vnd.'
-                            . Defaults::$apiVendor . '-v')
+                            . Defaults::$apiVendor.'-v')
                     ) {
                         $extension = substr($accept, $index + 1);
                         if (isset($this->formatMap[$extension])) {
@@ -846,8 +846,8 @@ 
             $this->responseFormat = $format;
             throw new RestException(
                 406,
-                'Content negotiation failed. ' .
-                'Try `' . $format->getMIME() . '` instead.'
+                'Content negotiation failed. '.
+                'Try `'.$format->getMIME().'` instead.'
             );
         } else {
             // Tell cache content is based at Accept header
@@ -874,7 +874,7 @@ 
                 } else {
                     throw new RestException(
                         406,
-                        'Content negotiation failed. ' .
+                        'Content negotiation failed. '.
                         'Requested charset is not supported'
                     );
                 }
@@ -922,8 +922,8 @@ 
             $filterObj = Scope::get($filterClass);
 
             if (!$filterObj instanceof iFilter) {
-                throw new RestException (
-                    500, 'Filter Class ' .
+                throw new RestException(
+                    500, 'Filter Class '.
                     'should implement iFilter');
             } else if (!($ok = $filterObj->__isAllowed())) {
                 if (is_null($ok)
@@ -955,8 +955,8 @@ 
                 try {
                     $authObj = Scope::get($authClass);
                     if (!method_exists($authObj, Defaults::$authenticationMethod)) {
-                        throw new RestException (
-                            500, 'Authentication Class ' .
+                        throw new RestException(
+                            500, 'Authentication Class '.
                             'should implement iAuthenticate');
                     } elseif (
                     !$authObj->{Defaults::$authenticationMethod}()
@@ -992,7 +992,7 @@ 
      */
     protected function postAuthFilter()
     {
-        if(empty($this->postAuthFilterClasses)) {
+        if (empty($this->postAuthFilterClasses)) {
             return;
         }
         $this->dispatch('postAuthFilter');
@@ -1051,7 +1051,7 @@ 
             $o->accessLevel);
         if (function_exists('newrelic_name_transaction'))
             newrelic_name_transaction("{$o->className}/{$o->methodName}");
-        $object =  Scope::get($o->className);
+        $object = Scope::get($o->className);
         switch ($accessLevel) {
             case 3 : //protected method
                 $reflectionMethod = new \ReflectionMethod(
@@ -1094,7 +1094,7 @@ 
     {
         //only GET method should be cached if allowed by API developer
         $expires = $this->requestMethod == 'GET' ? Defaults::$headerExpires : 0;
-        if(!is_array(Defaults::$headerCacheControl))
+        if (!is_array(Defaults::$headerCacheControl))
             Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
         $cacheControl = Defaults::$headerCacheControl[0];
         if ($expires > 0) {
@@ -1104,14 +1104,14 @@ 
             $cacheControl = str_replace('{expires}', $expires, $cacheControl);
             $expires = gmdate('D, d M Y H:i:s \G\M\T', time() + $expires);
         }
-        @header('Cache-Control: ' . $cacheControl);
-        @header('Expires: ' . $expires);
-        @header('X-Powered-By: Luracast Restler v' . Restler::VERSION);
+        @header('Cache-Control: '.$cacheControl);
+        @header('Expires: '.$expires);
+        @header('X-Powered-By: Luracast Restler v'.Restler::VERSION);
 
         if (Defaults::$crossOriginResourceSharing
             && isset($_SERVER['HTTP_ORIGIN'])
         ) {
-            header('Access-Control-Allow-Origin: ' .
+            header('Access-Control-Allow-Origin: '.
                 (Defaults::$accessControlAllowOrigin == '*'
                     ? $_SERVER['HTTP_ORIGIN']
                     : Defaults::$accessControlAllowOrigin)
@@ -1122,19 +1122,19 @@ 
 
         $this->responseFormat->setCharset(Defaults::$charset);
         $charset = $this->responseFormat->getCharset()
-            ? : Defaults::$charset;
+            ?: Defaults::$charset;
 
-        @header('Content-Type: ' . (
+        @header('Content-Type: '.(
             Defaults::$useVendorMIMEVersioning
                 ? 'application/vnd.'
                 . Defaults::$apiVendor
                 . "-v{$this->requestedApiVersion}"
-                . '+' . $this->responseFormat->getExtension()
+                . '+'.$this->responseFormat->getExtension()
                 : $this->responseFormat->getMIME())
-            . '; charset=' . $charset
+            . '; charset='.$charset
         );
 
-        @header('Content-Language: ' . Defaults::$language);
+        @header('Content-Language: '.Defaults::$language);
 
         if (isset($this->apiMethodInfo->metadata['header'])) {
             foreach ($this->apiMethodInfo->metadata['header'] as $header)
@@ -1152,7 +1152,7 @@ 
         }
         $this->responseCode = $code;
         @header(
-            "{$_SERVER['SERVER_PROTOCOL']} $code " .
+            "{$_SERVER['SERVER_PROTOCOL']} $code ".
             (isset(RestException::$codes[$code]) ? RestException::$codes[$code] : '')
         );
     }
@@ -1171,7 +1171,7 @@ 
             $authString = count($this->authClasses)
                 ? Scope::get($this->authClasses[0])->__getWWWAuthenticateString()
                 : 'Unknown';
-            @header('WWW-Authenticate: ' . $authString, false);
+            @header('WWW-Authenticate: '.$authString, false);
         }
         $this->dispatch('complete');
         if (Defaults::$returnResponse) {
@@ -1197,7 +1197,7 @@ 
 
         $this->exception = $exception;
 
-        $method = 'handle' . $exception->getCode();
+        $method = 'handle'.$exception->getCode();
         $handled = false;
         foreach ($this->errorClasses as $className) {
             if (method_exists($className, $method)) {
@@ -1255,8 +1255,7 @@ 
     public function setAPIVersion($version = 1, $minimum = 1)
     {
         if (!is_int($version) && $version < 1) {
-            throw new InvalidArgumentException
-            ('version should be an integer greater than 0');
+            throw new InvalidArgumentException('version should be an integer greater than 0');
         }
         $this->apiVersion = $version;
         if (is_int($minimum)) {
@@ -1311,7 +1310,7 @@ 
      */
     public function addAPIClass($className, $resourcePath = null)
     {
-        try{
+        try {
             if ($this->productionMode && is_null($this->cached)) {
                 $routes = $this->cache->get('routes');
                 if (isset($routes) && is_array($routes)) {
@@ -1341,12 +1340,12 @@ 
                 //versioned api
                 if (false !== ($index = strrpos($className, '\\'))) {
                     $name = substr($className, 0, $index)
-                        . '\\v{$version}' . substr($className, $index);
+                        . '\\v{$version}'.substr($className, $index);
                 } else if (false !== ($index = strrpos($className, '_'))) {
                     $name = substr($className, 0, $index)
-                        . '_v{$version}' . substr($className, $index);
+                        . '_v{$version}'.substr($className, $index);
                 } else {
-                    $name = 'v{$version}\\' . $className;
+                    $name = 'v{$version}\\'.$className;
                 }
 
                 for ($version = $this->apiMinimumVersion;
@@ -1478,13 +1477,13 @@ 
                     //versioned api
                     if (false !== ($index = strrpos($className, '\\'))) {
                         $name = substr($className, 0, $index)
-                            . '\\v{$version}' . substr($className, $index);
+                            . '\\v{$version}'.substr($className, $index);
                     } else {
                         if (false !== ($index = strrpos($className, '_'))) {
                             $name = substr($className, 0, $index)
-                                . '_v{$version}' . substr($className, $index);
+                                . '_v{$version}'.substr($className, $index);
                         } else {
-                            $name = 'v{$version}\\' . $className;
+                            $name = 'v{$version}\\'.$className;
                         }
                     }
 
@@ -1524,7 +1523,7 @@ 
             }
         } catch (Exception $e) {
             $e = new Exception(
-                "mapAPIClasses failed. " . $e->getMessage(),
+                "mapAPIClasses failed. ".$e->getMessage(),
                 $e->getCode(),
                 $e
             );
@@ -1653,7 +1652,7 @@ 
     protected function preCall()
     {
         $o = & $this->apiMethodInfo;
-        $preCall = '_pre_' . $o->methodName . '_'
+        $preCall = '_pre_'.$o->methodName.'_'
             . $this->requestFormat->getExtension();
 
         if (method_exists($o->className, $preCall)) {
@@ -1676,7 +1675,7 @@ 
     protected function postCall()
     {
         $o = & $this->apiMethodInfo;
-        $postCall = '_post_' . $o->methodName . '_' .
+        $postCall = '_post_'.$o->methodName.'_'.
             $this->responseFormat->getExtension();
         if (method_exists($o->className, $postCall)) {
             $this->dispatch('postCall');

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

Spacing +11 added lines, -11 removed lines

@@ -47,10 +47,10 @@ 
             if (!function_exists('finfo_open')) {
                 throw new RestException(
                     500,
-                    'Unable to find media type of ' .
-                    basename($filename) .
-                    ' either enable fileinfo php extension or update ' .
-                    'PassThrough::$mimeTypes to include mime type for ' . $extension .
+                    'Unable to find media type of '.
+                    basename($filename).
+                    ' either enable fileinfo php extension or update '.
+                    'PassThrough::$mimeTypes to include mime type for '.$extension.
                     ' extension'
                 );
             }
@@ -66,8 +66,8 @@ 
             $cacheControl = str_replace('{expires}', $expires, $cacheControl);
             $expires = gmdate('D, d M Y H:i:s \G\M\T', time() + $expires);
         }
-        header('Cache-Control: ' . $cacheControl);
-        header('Expires: ' . $expires);
+        header('Cache-Control: '.$cacheControl);
+        header('Expires: '.$expires);
         $lastModified = filemtime($filename);
         if (
             isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
@@ -76,13 +76,13 @@ 
             header("{$_SERVER['SERVER_PROTOCOL']} 304 Not Modified");
             exit;
         }
-        header('Last-Modified: ' . date('r', $lastModified));
-        header('X-Powered-By: Luracast Restler v' . Restler::VERSION);
-        header('Content-type: ' . $mime);
-        header("Content-Length: " . filesize($filename));
+        header('Last-Modified: '.date('r', $lastModified));
+        header('X-Powered-By: Luracast Restler v'.Restler::VERSION);
+        header('Content-type: '.$mime);
+        header("Content-Length: ".filesize($filename));
         if ($forceDownload) {
             header("Content-Transfer-Encoding: binary");
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
         }
         readfile($filename);
         exit;