@@ -43,19 +43,19 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $enabled = $configuration->get('dispatcher-log-enabled');
|
| 45 | 45 | |
| 46 | - $level = self::getLevel( $configuration->get('dispatcher-log-level') );
|
|
| 46 | + $level = self::getLevel($configuration->get('dispatcher-log-level'));
|
|
| 47 | 47 | |
| 48 | 48 | $target = $configuration->get('dispatcher-log-target');
|
| 49 | 49 | |
| 50 | 50 | $logger = new Logger($name); |
| 51 | 51 | |
| 52 | - if ( $enabled === true ) {
|
|
| 52 | + if ($enabled === true) {
|
|
| 53 | 53 | |
| 54 | - $logger->pushHandler( new StreamHandler( $target, $level) ); |
|
| 54 | + $logger->pushHandler(new StreamHandler($target, $level)); |
|
| 55 | 55 | |
| 56 | 56 | } else {
|
| 57 | 57 | |
| 58 | - $logger->pushHandler( new NullHandler($level) ); |
|
| 58 | + $logger->pushHandler(new NullHandler($level)); |
|
| 59 | 59 | |
| 60 | 60 | } |
| 61 | 61 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | protected static function getLevel($level) {
|
| 74 | 74 | |
| 75 | - switch ( strtoupper($level) ) {
|
|
| 75 | + switch (strtoupper($level)) {
|
|
| 76 | 76 | |
| 77 | 77 | case 'INFO': |
| 78 | 78 | $logger_level = Logger::INFO; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | $supported_methods = $this->configuration()->get('dispatcher-supported-methods'); |
| 96 | 96 | |
| 97 | - if ( method_exists($this, 'any') ) { |
|
| 97 | + if (method_exists($this, 'any')) { |
|
| 98 | 98 | |
| 99 | 99 | return $supported_methods; |
| 100 | 100 | |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $implemented_methods = array(); |
| 104 | 104 | |
| 105 | - foreach ( $supported_methods as $method ) { |
|
| 105 | + foreach ($supported_methods as $method) { |
|
| 106 | 106 | |
| 107 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method); |
|
| 107 | + if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method); |
|
| 108 | 108 | |
| 109 | 109 | } |
| 110 | 110 | |
@@ -118,11 +118,11 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | final public function getMethod($method) { |
| 120 | 120 | |
| 121 | - if ( method_exists($this, strtolower($method)) ) { |
|
| 121 | + if (method_exists($this, strtolower($method))) { |
|
| 122 | 122 | |
| 123 | 123 | return strtolower($method); |
| 124 | 124 | |
| 125 | - } else if ( method_exists($this, strtolower('any')) ) { |
|
| 125 | + } else if (method_exists($this, strtolower('any'))) { |
|
| 126 | 126 | |
| 127 | 127 | return 'any'; |
| 128 | 128 | |
@@ -104,7 +104,9 @@ |
||
| 104 | 104 | |
| 105 | 105 | foreach ( $supported_methods as $method ) { |
| 106 | 106 | |
| 107 | - if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method); |
|
| 107 | + if ( method_exists($this, strtolower($method)) ) { |
|
| 108 | + array_push($implemented_methods,$method); |
|
| 109 | + } |
|
| 108 | 110 | |
| 109 | 111 | } |
| 110 | 112 | |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | break; |
| 177 | 177 | |
| 178 | 178 | /** |
| 179 | - * @todo: how to get reverse allowed methods reference? |
|
| 180 | - */ |
|
| 179 | + * @todo: how to get reverse allowed methods reference? |
|
| 180 | + */ |
|
| 181 | 181 | // case 405: //Not allowed |
| 182 | 182 | // |
| 183 | 183 | // header('Allow: ' . $value, true, 405); |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | break; |
| 193 | 193 | |
| 194 | 194 | /** |
| 195 | - * @todo: how to get reverse allowed methods reference? |
|
| 196 | - */ |
|
| 195 | + * @todo: how to get reverse allowed methods reference? |
|
| 196 | + */ |
|
| 197 | 197 | // case 501: //Not implemented |
| 198 | 198 | // |
| 199 | 199 | // header('Allow: ' . $value, true, 501); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | header($_SERVER["SERVER_PROTOCOL"].' 204 No Content'); |
| 117 | 117 | header('Status: 204 No Content'); |
| 118 | - header('Content-Length: 0',true); |
|
| 118 | + header('Content-Length: 0', true); |
|
| 119 | 119 | |
| 120 | 120 | $return = null; |
| 121 | 121 | |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | case 303: //See Other |
| 128 | 128 | case 307: //Temporary Redirect |
| 129 | 129 | |
| 130 | - header("Location: ".$location->get(),true,$status); |
|
| 130 | + header("Location: ".$location->get(), true, $status); |
|
| 131 | 131 | |
| 132 | 132 | break; |
| 133 | 133 | |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | $last_modified = $headers->get('Last-Modified'); |
| 137 | 137 | |
| 138 | - if ( is_null($last_modified) ) { |
|
| 138 | + if (is_null($last_modified)) { |
|
| 139 | 139 | |
| 140 | 140 | header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified'); |
| 141 | 141 | |
| 142 | - } else if ( is_int($last_modified) ) { |
|
| 142 | + } else if (is_int($last_modified)) { |
|
| 143 | 143 | |
| 144 | 144 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT', true, 304); |
| 145 | 145 | |
@@ -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 | |
@@ -43,15 +43,15 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | $value = $this->attributes[$property]; |
| 45 | 45 | |
| 46 | - if ( is_scalar($value) && preg_match_all('/%(.+?)%/', $value, $matches) ) { |
|
| 46 | + if (is_scalar($value) && preg_match_all('/%(.+?)%/', $value, $matches)) { |
|
| 47 | 47 | |
| 48 | 48 | $substitutions = array(); |
| 49 | 49 | |
| 50 | - foreach ( $matches as $match ) { |
|
| 50 | + foreach ($matches as $match) { |
|
| 51 | 51 | |
| 52 | 52 | $backreference = $match[1]; |
| 53 | 53 | |
| 54 | - if ( $backreference != $property && !isset($substitutions['/%'.$backreference.'%/']) ) { |
|
| 54 | + if ($backreference != $property && !isset($substitutions['/%'.$backreference.'%/'])) { |
|
| 55 | 55 | |
| 56 | 56 | $substitutions['/%'.$backreference.'%/'] = $this->$backreference; |
| 57 | 57 | |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | final public function delete($property = null) { |
| 91 | 91 | |
| 92 | - if ( is_null($property) ) { |
|
| 92 | + if (is_null($property)) { |
|
| 93 | 93 | |
| 94 | 94 | $this->attributes = array(); |
| 95 | 95 | |
| 96 | 96 | return true; |
| 97 | 97 | |
| 98 | - } else if ( $this->isDefined($property) ) { |
|
| 98 | + } else if ($this->isDefined($property)) { |
|
| 99 | 99 | |
| 100 | 100 | unset($this->attributes[$property]); |
| 101 | 101 | |
@@ -128,20 +128,20 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | foreach ($decoded as $key => $string) { |
| 130 | 130 | |
| 131 | - $this->logger->debug("PARAMETER KEY: " . $key); |
|
| 131 | + $this->logger->debug("PARAMETER KEY: ".$key); |
|
| 132 | 132 | |
| 133 | - $this->logger->debug("PARAMETER STRING: " . $string); |
|
| 133 | + $this->logger->debug("PARAMETER STRING: ".$string); |
|
| 134 | 134 | |
| 135 | 135 | $param_regex .= $this->readparam($key, $string, $param_required); |
| 136 | 136 | |
| 137 | - $this->logger->debug("PARAMETER REGEX: " . $param_regex); |
|
| 137 | + $this->logger->debug("PARAMETER REGEX: ".$param_regex); |
|
| 138 | 138 | |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | $this->readpath( |
| 142 | 142 | $folders, |
| 143 | 143 | $value, |
| 144 | - $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?') |
|
| 144 | + $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?') |
|
| 145 | 145 | ); |
| 146 | 146 | |
| 147 | 147 | } else { |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $string = preg_replace('/(?<!\\)\((?!\?)/', '(?:', $string); |
| 185 | 185 | $string = preg_replace('/\.([\*\+])(?!\?)/', '.\${1}?', $string); |
| 186 | 186 | |
| 187 | - return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?'); |
|
| 187 | + return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?'); |
|
| 188 | 188 | |
| 189 | 189 | } |
| 190 | 190 | |
@@ -200,15 +200,15 @@ discard block |
||
| 200 | 200 | "query" => array() |
| 201 | 201 | ); |
| 202 | 202 | |
| 203 | - $this->logger->debug("ROUTE: " . $route); |
|
| 203 | + $this->logger->debug("ROUTE: ".$route); |
|
| 204 | 204 | |
| 205 | - $this->logger->debug("PARAMETERS: " . var_export($value, true)); |
|
| 205 | + $this->logger->debug("PARAMETERS: ".var_export($value, true)); |
|
| 206 | 206 | |
| 207 | 207 | $regex = $this->readpath($folders, $value); |
| 208 | 208 | |
| 209 | - $this->logger->debug("ROUTE: " . $regex); |
|
| 209 | + $this->logger->debug("ROUTE: ".$regex); |
|
| 210 | 210 | |
| 211 | - $this->logger->debug("PARAMETERS: " . var_export($value, true)); |
|
| 211 | + $this->logger->debug("PARAMETERS: ".var_export($value, true)); |
|
| 212 | 212 | |
| 213 | 213 | $this->routes[$regex] = $value; |
| 214 | 214 | |
@@ -73,10 +73,11 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $regex = $this->readpath($folders); |
| 75 | 75 | |
| 76 | - if (isset($this->routes[$regex])) |
|
| 77 | - return $this->routes[$regex]; |
|
| 78 | - else |
|
| 79 | - return null; |
|
| 76 | + if (isset($this->routes[$regex])) { |
|
| 77 | + return $this->routes[$regex]; |
|
| 78 | + } else { |
|
| 79 | + return null; |
|
| 80 | + } |
|
| 80 | 81 | |
| 81 | 82 | } |
| 82 | 83 | |
@@ -86,7 +87,9 @@ discard block |
||
| 86 | 87 | |
| 87 | 88 | $regex = $this->readpath($folders); |
| 88 | 89 | |
| 89 | - if (isset($this->routes[$regex])) unset($this->routes[$regex]); |
|
| 90 | + if (isset($this->routes[$regex])) { |
|
| 91 | + unset($this->routes[$regex]); |
|
| 92 | + } |
|
| 90 | 93 | |
| 91 | 94 | } |
| 92 | 95 | |