Commit 9d25418b by Philippe Gaultier

Remove static functions

parent be2d5530
...@@ -127,7 +127,7 @@ class Cors extends ActionFilter ...@@ -127,7 +127,7 @@ class Cors extends ActionFilter
$headers = []; $headers = [];
$requestHeaders = array_keys($this->cors); $requestHeaders = array_keys($this->cors);
foreach ($requestHeaders as $headerField) { foreach ($requestHeaders as $headerField) {
$serverField = static::headerizeToPhp($headerField); $serverField = $this->headerizeToPhp($headerField);
$headerData = isset($_SERVER[$serverField])?$_SERVER[$serverField]:null; $headerData = isset($_SERVER[$serverField])?$_SERVER[$serverField]:null;
if ($headerData !== null) { if ($headerData !== null) {
$headers[$headerField] = $headerData; $headers[$headerField] = $headerData;
...@@ -182,7 +182,7 @@ class Cors extends ActionFilter ...@@ -182,7 +182,7 @@ class Cors extends ActionFilter
if ($type === 'Method') { if ($type === 'Method') {
$responseHeaders[$responseHeaderField] = strtoupper($requestHeaders[$requestHeaderField]); $responseHeaders[$responseHeaderField] = strtoupper($requestHeaders[$requestHeaderField]);
} elseif ($type === 'Headers') { } elseif ($type === 'Headers') {
$responseHeaders[$responseHeaderField] = static::headerize($requestHeaders[$requestHeaderField]); $responseHeaders[$responseHeaderField] = $this->headerize($requestHeaders[$requestHeaderField]);
} }
} else { } else {
$requestedData = preg_split("/[\s,]+/", $requestHeaders[$requestHeaderField], -1, PREG_SPLIT_NO_EMPTY); $requestedData = preg_split("/[\s,]+/", $requestHeaders[$requestHeaderField], -1, PREG_SPLIT_NO_EMPTY);
...@@ -191,7 +191,7 @@ class Cors extends ActionFilter ...@@ -191,7 +191,7 @@ class Cors extends ActionFilter
if ($type === 'Method') { if ($type === 'Method') {
$req = strtoupper($req); $req = strtoupper($req);
} elseif ($type === 'Headers') { } elseif ($type === 'Headers') {
$req = static::headerize($req); $req = $this->headerize($req);
} }
if (in_array($req, $this->cors[$requestHeaderField])) { if (in_array($req, $this->cors[$requestHeaderField])) {
$acceptedData[] = $req; $acceptedData[] = $req;
...@@ -226,7 +226,7 @@ class Cors extends ActionFilter ...@@ -226,7 +226,7 @@ class Cors extends ActionFilter
* @param string $string string to convert * @param string $string string to convert
* @return string the result in "header" format * @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 = preg_split("/[\s,]+/", $string, -1, PREG_SPLIT_NO_EMPTY);
$headers = array_map(function($element) { $headers = array_map(function($element) {
...@@ -242,7 +242,7 @@ class Cors extends ActionFilter ...@@ -242,7 +242,7 @@ class Cors extends ActionFilter
* @param string $string string to convert * @param string $string string to convert
* @return string the result in "php $_SERVER header" format * @return string the result in "php $_SERVER header" format
*/ */
protected static function headerizeToPhp($string) protected function headerizeToPhp($string)
{ {
return 'HTTP_'.strtoupper(str_replace([' ', '-'], ['_', '_'], $string)); return 'HTTP_'.strtoupper(str_replace([' ', '-'], ['_', '_'], $string));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment