diff --git a/control/Controller.php b/control/Controller.php index 8dde3d897..8a173a913 100644 --- a/control/Controller.php +++ b/control/Controller.php @@ -576,7 +576,7 @@ class Controller extends RequestHandler implements TemplateGlobalProvider { $queryargs = array_merge($queryargs, $localargs); } if((is_string($arg) && $arg) || is_numeric($arg)) { - $arg = (string)$arg; + $arg = (string) $arg; if($result && substr($result,-1) != '/' && $arg[0] != '/') $result .= "/$arg"; else $result .= (substr($result, -1) == '/' && $arg[0] == '/') ? ltrim($arg, '/') : $arg; } diff --git a/control/Director.php b/control/Director.php index c98af9743..2c40e9a0c 100644 --- a/control/Director.php +++ b/control/Director.php @@ -137,7 +137,7 @@ class Director implements TemplateGlobalProvider { : $_SERVER['REQUEST_METHOD'], $url, $_GET, - ArrayLib::array_merge_recursive((array)$_POST, (array)$_FILES), + ArrayLib::array_merge_recursive((array) $_POST, (array) $_FILES), @file_get_contents('php://input') ); @@ -310,9 +310,9 @@ class Director implements TemplateGlobalProvider { } // Replace the superglobals with appropriate test values - $_REQUEST = ArrayLib::array_merge_recursive((array)$getVars, (array)$postVars); - $_GET = (array)$getVars; - $_POST = (array)$postVars; + $_REQUEST = ArrayLib::array_merge_recursive((array) $getVars, (array) $postVars); + $_GET = (array) $getVars; + $_POST = (array) $postVars; $_SESSION = $session ? $session->inst_getAll() : array(); $_COOKIE = $cookieJar->getAll(false); Injector::inst()->registerService($cookieJar, 'Cookie_Backend'); diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php index 14e04d0c9..2abba7699 100644 --- a/control/HTTPResponse.php +++ b/control/HTTPResponse.php @@ -160,7 +160,7 @@ class SS_HTTPResponse { * @return SS_HTTPRequest $this */ public function setBody($body) { - $this->body = $body ? (string)$body : $body; // Don't type-cast false-ish values, eg null is null not '' + $this->body = $body ? (string) $body : $body; // Don't type-cast false-ish values, eg null is null not '' return $this; } diff --git a/control/PjaxResponseNegotiator.php b/control/PjaxResponseNegotiator.php index fa7782d41..5514326a0 100644 --- a/control/PjaxResponseNegotiator.php +++ b/control/PjaxResponseNegotiator.php @@ -87,7 +87,7 @@ class PjaxResponseNegotiator { foreach($fragments as $fragment) { if(isset($callbacks[$fragment])) { $res = call_user_func($callbacks[$fragment]); - $responseParts[$fragment] = $res ? (string)$res : $res; + $responseParts[$fragment] = $res ? (string) $res : $res; } else { throw new SS_HTTPResponse_Exception("X-Pjax = '$fragment' not supported for this URL.", 400); } diff --git a/control/RequestHandler.php b/control/RequestHandler.php index 1cbb41f56..41f5eba60 100644 --- a/control/RequestHandler.php +++ b/control/RequestHandler.php @@ -351,7 +351,7 @@ class RequestHandler extends ViewableData { if($action == 'index') return true; // Don't allow access to any non-public methods (inspect instance plus all extensions) - $insts = array_merge(array($this), (array)$this->getExtensionInstances()); + $insts = array_merge(array($this), (array) $this->getExtensionInstances()); foreach($insts as $inst) { if(!method_exists($inst, $action)) continue; $r = new ReflectionClass(get_class($inst)); @@ -389,7 +389,7 @@ class RequestHandler extends ViewableData { $action = strtolower($actionOrigCasing); $definingClass = null; - $insts = array_merge(array($this), (array)$this->getExtensionInstances()); + $insts = array_merge(array($this), (array) $this->getExtensionInstances()); foreach($insts as $inst) { if(!method_exists($inst, $action)) continue; $r = new ReflectionClass(get_class($inst));