@@ -41,13 +41,13 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | private static function getHeaders() { |
| 43 | 43 | |
| 44 | - if ( function_exists('getallheaders') ) return getallheaders(); |
|
| 44 | + if (function_exists('getallheaders')) return getallheaders(); |
|
| 45 | 45 | |
| 46 | 46 | $headers = array(); |
| 47 | 47 | |
| 48 | - foreach ( $_SERVER as $name => $value ) { |
|
| 48 | + foreach ($_SERVER as $name => $value) { |
|
| 49 | 49 | |
| 50 | - if ( substr($name, 0, 5) == 'HTTP_' ) { |
|
| 50 | + if (substr($name, 0, 5) == 'HTTP_') { |
|
| 51 | 51 | |
| 52 | 52 | $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; |
| 53 | 53 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | private static function getParameters() { |
| 48 | 48 | |
| 49 | - switch( $_SERVER['REQUEST_METHOD'] ) { |
|
| 49 | + switch ($_SERVER['REQUEST_METHOD']) { |
|
| 50 | 50 | |
| 51 | 51 | case 'POST': |
| 52 | 52 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | private static function getParameters() { |
| 48 | 48 | |
| 49 | - switch( $_SERVER['REQUEST_METHOD'] ) { |
|
| 49 | + switch ($_SERVER['REQUEST_METHOD']) { |
|
| 50 | 50 | |
| 51 | 51 | case 'POST': |
| 52 | 52 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | protected $attributes = array(); |
| 29 | 29 | |
| 30 | - public function __construct( $configuration = array() ) { |
|
| 30 | + public function __construct($configuration = array()) { |
|
| 31 | 31 | |
| 32 | 32 | $this->attributes = array_merge($this->attributes, $configuration); |
| 33 | 33 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | final public function get($property = null) { |
| 37 | 37 | |
| 38 | - if ( is_null($property) ) { |
|
| 38 | + if (is_null($property)) { |
|
| 39 | 39 | |
| 40 | 40 | return $this->attributes; |
| 41 | 41 | |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | final public function delete($property = null) { |
| 93 | 93 | |
| 94 | - if ( is_null($property) ) { |
|
| 94 | + if (is_null($property)) { |
|
| 95 | 95 | |
| 96 | 96 | $this->attributes = array(); |
| 97 | 97 | |
| 98 | 98 | return true; |
| 99 | 99 | |
| 100 | - } else if ( $this->isDefined($property) ) { |
|
| 100 | + } else if ($this->isDefined($property)) { |
|
| 101 | 101 | |
| 102 | 102 | unset($this->attributes[$property]); |
| 103 | 103 | |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function get($header = null) { |
| 31 | 31 | |
| 32 | - if ( is_null($header) ) return $this->headers; |
|
| 32 | + if (is_null($header)) return $this->headers; |
|
| 33 | 33 | |
| 34 | - else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header]; |
|
| 34 | + else if (array_key_exists($header, $this->headers)) return $this->headers[$header]; |
|
| 35 | 35 | |
| 36 | 36 | else return null; |
| 37 | 37 | |
@@ -39,14 +39,14 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getAsString($header = null) { |
| 41 | 41 | |
| 42 | - if ( is_null($header) ) { |
|
| 42 | + if (is_null($header)) { |
|
| 43 | 43 | |
| 44 | - return array_map( function($header, $value) { |
|
| 44 | + return array_map(function($header, $value) { |
|
| 45 | 45 | return (string)($header.':'.$value); |
| 46 | 46 | }, |
| 47 | 47 | $this->headers); |
| 48 | 48 | |
| 49 | - } else if ( array_key_exists($header, $this->headers) ) { |
|
| 49 | + } else if (array_key_exists($header, $this->headers)) { |
|
| 50 | 50 | |
| 51 | 51 | return (string)($header.':'.$this->headers[$header]); |
| 52 | 52 | |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function set($header, $value=null) { |
|
| 57 | + public function set($header, $value = null) { |
|
| 58 | 58 | |
| 59 | - if ( is_null($value) ) { |
|
| 59 | + if (is_null($value)) { |
|
| 60 | 60 | |
| 61 | 61 | $header = explode(":", $header); |
| 62 | 62 | |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | public function delete($header = null) { |
| 76 | 76 | |
| 77 | - if ( is_null($header) ) { |
|
| 77 | + if (is_null($header)) { |
|
| 78 | 78 | |
| 79 | 79 | $this->headers = array(); |
| 80 | 80 | |
| 81 | 81 | return true; |
| 82 | 82 | |
| 83 | - } else if ( array_key_exists($header, $this->headers) ) { |
|
| 83 | + } else if (array_key_exists($header, $this->headers)) { |
|
| 84 | 84 | |
| 85 | 85 | unset($this->headers[$header]); |
| 86 | 86 | |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | |
| 36 | 36 | final public function setTimestamp($time = null) { |
| 37 | 37 | |
| 38 | - if ( is_float($time) ) $this->timestamp = $time; |
|
| 38 | + if (is_float($time)) $this->timestamp = $time; |
|
| 39 | 39 | |
| 40 | 40 | else $this->timestamp = microtime(true); |
| 41 | 41 | |
@@ -27,11 +27,11 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | protected $parameters = array(); |
| 29 | 29 | |
| 30 | - final public function get($parameter=null, $index=null) { |
|
| 30 | + final public function get($parameter = null, $index = null) { |
|
| 31 | 31 | |
| 32 | - if ( is_null($parameter) ) return $this->parameters; |
|
| 32 | + if (is_null($parameter)) return $this->parameters; |
|
| 33 | 33 | |
| 34 | - else if ( array_key_exists($parameter, $this->parameters) ) { |
|
| 34 | + else if (array_key_exists($parameter, $this->parameters)) { |
|
| 35 | 35 | |
| 36 | 36 | $value = $this->parameters[$parameter]; |
| 37 | 37 | |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | final public function delete($parameter = null) { |
| 71 | 71 | |
| 72 | - if ( is_null($parameter) ) { |
|
| 72 | + if (is_null($parameter)) { |
|
| 73 | 73 | |
| 74 | 74 | $this->parameters = array(); |
| 75 | 75 | |
| 76 | 76 | return true; |
| 77 | 77 | |
| 78 | - } else if ( array_key_exists($parameter, $this->parameters) ) { |
|
| 78 | + } else if (array_key_exists($parameter, $this->parameters)) { |
|
| 79 | 79 | |
| 80 | 80 | unset($this->parameters[$parameter]); |
| 81 | 81 | |
@@ -73,9 +73,9 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | foreach ($decoded as $key => $string) { |
| 75 | 75 | |
| 76 | - $this->logger->debug("PARAMETER KEY: " . $key); |
|
| 76 | + $this->logger->debug("PARAMETER KEY: ".$key); |
|
| 77 | 77 | |
| 78 | - $this->logger->debug("PARAMETER STRING: " . $string); |
|
| 78 | + $this->logger->debug("PARAMETER STRING: ".$string); |
|
| 79 | 79 | |
| 80 | 80 | /* The key and the regex of every paramater is passed to the 'param' |
| 81 | 81 | * method which will build an appropriate regular expression and will understand |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | $param_regex .= $this->param($key, $string, $param_required, $value); |
| 85 | 85 | |
| 86 | - $this->logger->debug("PARAMETER REGEX: " . $param_regex); |
|
| 86 | + $this->logger->debug("PARAMETER REGEX: ".$param_regex); |
|
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | // Once the parameter is analyzed, the result is passed to the next iteration |
| 90 | 90 | return $this->read( |
| 91 | 91 | $folders, |
| 92 | 92 | $value, |
| 93 | - $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?') |
|
| 93 | + $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?') |
|
| 94 | 94 | ); |
| 95 | 95 | |
| 96 | 96 | } else { |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * If the field is required, the regular expression is completed with a '{1}' (which make it compulsory), |
| 156 | 156 | * otherwise a '?' is added. |
| 157 | 157 | */ |
| 158 | - return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?'); |
|
| 158 | + return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?'); |
|
| 159 | 159 | |
| 160 | 160 | } |
| 161 | 161 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | public function getServiceName() { |
| 83 | 83 | |
| 84 | - return (empty($this->service))?"default":implode('.', $this->service); |
|
| 84 | + return (empty($this->service)) ? "default" : implode('.', $this->service); |
|
| 85 | 85 | |
| 86 | 86 | } |
| 87 | 87 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | public function getParameter($key) { |
| 105 | 105 | |
| 106 | - return (isset($this->parameters[$key]))?$this->parameters[$key]:null; |
|
| 106 | + return (isset($this->parameters[$key])) ? $this->parameters[$key] : null; |
|
| 107 | 107 | |
| 108 | 108 | } |
| 109 | 109 | |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | public function isQueryRequired($key) { |
| 144 | 144 | |
| 145 | - return isset($this->query[$key])?$this->query[$key]["required"]:false; |
|
| 145 | + return isset($this->query[$key]) ? $this->query[$key]["required"] : false; |
|
| 146 | 146 | |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | public function getQueryRegex($key) { |
| 150 | 150 | |
| 151 | - return isset($this->query[$key])?$this->query[$key]["regex"]:null; |
|
| 151 | + return isset($this->query[$key]) ? $this->query[$key]["regex"] : null; |
|
| 152 | 152 | |
| 153 | 153 | } |
| 154 | 154 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | /* if it's available a bit associated with the parameter name, it is compared against |
| 221 | 221 | * it's regular expression in order to extrect backreferences |
| 222 | 222 | */ |
| 223 | - if (preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches)) { |
|
| 223 | + if (preg_match('/^'.$value['regex'].'$/', $path[$key], $matches)) { |
|
| 224 | 224 | |
| 225 | 225 | if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available. |
| 226 | 226 | |