@@ -376,7 +376,7 @@  | 
                                                    ||
| 376 | 376 | /**  | 
                                                        
| 377 | 377 | * @param RequestInterface $request  | 
                                                        
| 378 | 378 | *  | 
                                                        
| 379 | - * @return null|string  | 
                                                        |
| 379 | + * @return string  | 
                                                        |
| 380 | 380 | */  | 
                                                        
| 381 | 381 | private function getRequestHostHeader(RequestInterface $request)  | 
                                                        
| 382 | 382 |      { | 
                                                        
@@ -132,7 +132,7 @@ discard block  | 
                                                    ||
| 132 | 132 |          if ($this->strategy->isCheckHost() === true && $this->isSameHost($request, $serverOrigin) === false) { | 
                                                        
| 133 | 133 | $host = $this->getRequestHostHeader($request);  | 
                                                        
| 134 | 134 | $this->logInfo(  | 
                                                        
| 135 | - 'Host header in request either absent or do not match server origin. ' .  | 
                                                        |
| 135 | + 'Host header in request either absent or do not match server origin. '.  | 
                                                        |
| 136 | 136 | 'Check config settings for Server Origin and Host Check.',  | 
                                                        
| 137 | 137 | ['host' => $host, 'server' => $serverOrigin]  | 
                                                        
| 138 | 138 | );  | 
                                                        
@@ -145,7 +145,7 @@ discard block  | 
                                                    ||
| 145 | 145 | $requestOrigin = $this->getOrigin($request);  | 
                                                        
| 146 | 146 |          if ($requestOrigin === null || $this->isCrossOrigin($requestOrigin, $serverOrigin) === false) { | 
                                                        
| 147 | 147 | $this->logDebug(  | 
                                                        
| 148 | - 'Request is not CORS (request origin is empty or equals to server one). ' .  | 
                                                        |
| 148 | + 'Request is not CORS (request origin is empty or equals to server one). '.  | 
                                                        |
| 149 | 149 | 'Check config settings for Server Origin.',  | 
                                                        
| 150 | 150 | ['request' => $requestOrigin, 'server' => $serverOrigin]  | 
                                                        
| 151 | 151 | );  | 
                                                        
@@ -221,7 +221,7 @@ discard block  | 
                                                    ||
| 221 | 221 | // #6.2.3  | 
                                                        
| 222 | 222 | $requestMethod = $request->getHeader(CorsRequestHeaders::METHOD);  | 
                                                        
| 223 | 223 |          if (empty($requestMethod) === true) { | 
                                                        
| 224 | -            $this->logDebug('Request is not CORS (header ' . CorsRequestHeaders::METHOD . ' is not specified).'); | 
                                                        |
| 224 | +            $this->logDebug('Request is not CORS (header '.CorsRequestHeaders::METHOD.' is not specified).'); | 
                                                        |
| 225 | 225 | return $this->createResult(AnalysisResultInterface::TYPE_REQUEST_OUT_OF_CORS_SCOPE);  | 
                                                        
| 226 | 226 |          } else { | 
                                                        
| 227 | 227 | $requestMethod = $requestMethod[0];  | 
                                                        
@@ -295,7 +295,7 @@ discard block  | 
                                                    ||
| 295 | 295 | // after explode header names might have spaces in the beginnings and ends...  | 
                                                        
| 296 | 296 | $requestHeaders = explode(CorsRequestHeaders::HEADERS_SEPARATOR, $requestHeaders[0]);  | 
                                                        
| 297 | 297 | // ... so trim the spaces and convert values to lower case  | 
                                                        
| 298 | -            $requestHeaders = array_map(function ($headerName) { | 
                                                        |
| 298 | +            $requestHeaders = array_map(function($headerName) { | 
                                                        |
| 299 | 299 | return strtolower(trim($headerName));  | 
                                                        
| 300 | 300 | }, $requestHeaders);  | 
                                                        
| 301 | 301 | }  | 
                                                        
@@ -362,7 +362,7 @@ discard block  | 
                                                    ||
| 362 | 362 |          if ($request->hasHeader(CorsRequestHeaders::ORIGIN) === true) { | 
                                                        
| 363 | 363 | $header = $request->getHeader(CorsRequestHeaders::ORIGIN);  | 
                                                        
| 364 | 364 |              if (empty($header) === false) { | 
                                                        
| 365 | - $value = $header[0];  | 
                                                        |
| 365 | + $value = $header[0];  | 
                                                        |
| 366 | 366 |                  try { | 
                                                        
| 367 | 367 | $origin = $this->factory->createParsedUrl($value);  | 
                                                        
| 368 | 368 |                  } catch (InvalidArgumentException $exception) { | 
                                                        
@@ -105,9 +105,9 @@  | 
                                                    ||
| 105 | 105 | public function getOrigin()  | 
                                                        
| 106 | 106 |      { | 
                                                        
| 107 | 107 |          if ($this->urlAsString === null) { | 
                                                        
| 108 | - $url = $this->scheme === null ? '' : $this->scheme . ':';  | 
                                                        |
| 109 | - $url .= $this->host === null ? '' : '//' . $this->host;  | 
                                                        |
| 110 | - $url .= $this->port === self::DEFAULT_PORT ? '' : ':' . $this->port;  | 
                                                        |
| 108 | + $url = $this->scheme === null ? '' : $this->scheme.':';  | 
                                                        |
| 109 | + $url .= $this->host === null ? '' : '//'.$this->host;  | 
                                                        |
| 110 | + $url .= $this->port === self::DEFAULT_PORT ? '' : ':'.$this->port;  | 
                                                        |
| 111 | 111 | |
| 112 | 112 | $this->urlAsString = $url;  | 
                                                        
| 113 | 113 | }  |