adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix coding standard violations

Browse source
This commit is contained in:
Melvin Ross 2014-06-12 08:47:40 -05:00
parent 86923e3593
commit 361531509e
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Network/CakeSocket.php
View file

@ -131,8 +131,8 @@ class CakeSocket {
}
$scheme = null;
if (!empty($this->config['protocol']) && strpos($this->config['host'], '://') === false) {
$scheme = $this->config['protocol'].'://';
if (!empty($this->config['protocol']) && strpos($this->config['host'], '://') === false) {
$scheme = $this->config['protocol'] . '://';
}
if (!empty($this->config['context'])) {

8
lib/Cake/Network/Http/HttpSocket.php
View file

@ -341,8 +341,8 @@ class HttpSocket extends CakeSocket {
if (!empty($this->request['body']) && !isset($this->request['header']['Content-Length'])) {
$this->request['header']['Content-Length'] = strlen($this->request['body']);
}
if(isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https'){
$this->config['protocol'] = 'ssl';
if (isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https' && empty($this->config['protocol'])) {
$this->config['protocol'] = 'ssl';
}
$connectionType = null;
@ -525,7 +525,7 @@ class HttpSocket extends CakeSocket {
}
/**
* Issues a HEADER request to the specified URI, query, and request.
* Issues a HEAD request to the specified URI, query, and request.
*
* @param string|array $uri URI to request (see {@link _parseUri()})
* @param array $data Array of request body data keys and values.
@ -537,8 +537,6 @@ class HttpSocket extends CakeSocket {
return $this->request($request);
}
/**
* Normalizes URLs into a $uriTemplate. If no template is provided
* a default one will be used. Will generate the URL using the