php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove static functions

Browse Source
This commit is contained in:
Philippe Gaultier
2014-07-04 16:55:34 +02:00
parent be2d5530f3
commit 9d25418b05
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/filters/Cors.php
View File

@ -127,7 +127,7 @@ class Cors extends ActionFilter
$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 @@ class Cors extends ActionFilter
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 @@ class Cors extends ActionFilter
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 @@ class Cors extends ActionFilter
* @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 @@ class Cors extends ActionFilter
* @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));
}