From 9d25418b0526ea7efc3e48e248b263ad94465c84 Mon Sep 17 00:00:00 2001 From: Philippe Gaultier Date: Fri, 4 Jul 2014 16:55:34 +0200 Subject: [PATCH] Remove static functions --- framework/filters/Cors.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/filters/Cors.php b/framework/filters/Cors.php index d91eda63919..1529c879cfe 100644 --- a/framework/filters/Cors.php +++ b/framework/filters/Cors.php @@ -127,7 +127,7 @@ public function extractHeaders($request) $headers = []; $requestHeaders = array_keys($this->cors); foreach ($requestHeaders as $headerField) { - $serverField = static::headerizeToPhp($headerField); + $serverField = $this->headerizeToPhp($headerField); $headerData = isset($_SERVER[$serverField])?$_SERVER[$serverField]:null; if ($headerData !== null) { $headers[$headerField] = $headerData; @@ -182,7 +182,7 @@ protected function prepareAllowHeaders($type, $requestHeaders, &$responseHeaders if ($type === 'Method') { $responseHeaders[$responseHeaderField] = strtoupper($requestHeaders[$requestHeaderField]); } elseif ($type === 'Headers') { - $responseHeaders[$responseHeaderField] = static::headerize($requestHeaders[$requestHeaderField]); + $responseHeaders[$responseHeaderField] = $this->headerize($requestHeaders[$requestHeaderField]); } } else { $requestedData = preg_split("/[\s,]+/", $requestHeaders[$requestHeaderField], -1, PREG_SPLIT_NO_EMPTY); @@ -191,7 +191,7 @@ protected function prepareAllowHeaders($type, $requestHeaders, &$responseHeaders if ($type === 'Method') { $req = strtoupper($req); } elseif ($type === 'Headers') { - $req = static::headerize($req); + $req = $this->headerize($req); } if (in_array($req, $this->cors[$requestHeaderField])) { $acceptedData[] = $req; @@ -226,7 +226,7 @@ public function addCorsHeaders($response, $headers) * @param string $string string to convert * @return string the result in "header" format */ - protected static function headerize($string) + protected function headerize($string) { $headers = preg_split("/[\s,]+/", $string, -1, PREG_SPLIT_NO_EMPTY); $headers = array_map(function($element) { @@ -242,7 +242,7 @@ protected static function headerize($string) * @param string $string string to convert * @return string the result in "php $_SERVER header" format */ - protected static function headerizeToPhp($string) + protected function headerizeToPhp($string) { return 'HTTP_'.strtoupper(str_replace([' ', '-'], ['_', '_'], $string)); }