@@ -209,6 +209,9 @@ |
||
209 | 209 | |
210 | 210 | } |
211 | 211 | |
212 | + /** |
|
213 | + * @param string[] $bits |
|
214 | + */ |
|
212 | 215 | private function evalUri($parameters, $bits) { |
213 | 216 | |
214 | 217 | $count = 0; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | 'dispatcher-log-level' => 'INFO', |
35 | 35 | 'dispatcher-log-target' => '%dispatcher-log-folder%/dispatcher.log', |
36 | 36 | 'dispatcher-log-folder' => '/log', |
37 | - 'dispatcher-supported-methods' => array('GET','PUT','POST','DELETE','OPTIONS','HEAD'), |
|
37 | + 'dispatcher-supported-methods' => array('GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD'), |
|
38 | 38 | 'dispatcher-default-encoding' => 'UTF-8', |
39 | 39 | 'dispatcher-cache-enabled' => true, |
40 | 40 | 'dispatcher-cache-ttl' => 3600, |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | //'dispatcher-autoroute' => false |
45 | 45 | ); |
46 | 46 | |
47 | - public function __construct( $configuration = array() ) { |
|
47 | + public function __construct($configuration = array()) { |
|
48 | 48 | |
49 | 49 | $this->attributes['dispatcher-base-url'] = self::urlGetAbsolute(); |
50 | 50 | |
@@ -60,15 +60,15 @@ discard block |
||
60 | 60 | |
61 | 61 | $value = $this->attributes[$property]; |
62 | 62 | |
63 | - if ( is_scalar($value) && preg_match_all('/%(.+?)%/', $value, $matches) ) { |
|
63 | + if (is_scalar($value) && preg_match_all('/%(.+?)%/', $value, $matches)) { |
|
64 | 64 | |
65 | 65 | $substitutions = array(); |
66 | 66 | |
67 | - foreach ( $matches as $match ) { |
|
67 | + foreach ($matches as $match) { |
|
68 | 68 | |
69 | 69 | $backreference = $match[1]; |
70 | 70 | |
71 | - if ( $backreference != $property && !isset($substitutions['/%'.$backreference.'%/']) ) { |
|
71 | + if ($backreference != $property && !isset($substitutions['/%'.$backreference.'%/'])) { |
|
72 | 72 | |
73 | 73 | $substitutions['/%'.$backreference.'%/'] = $this->$backreference; |
74 | 74 | |
@@ -112,11 +112,11 @@ discard block |
||
112 | 112 | |
113 | 113 | private static function urlGetAbsolute() { |
114 | 114 | |
115 | - $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://'; |
|
115 | + $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://'; |
|
116 | 116 | |
117 | 117 | $uri = preg_replace("/\/index.php(.*?)$/i", "", $_SERVER['PHP_SELF']); |
118 | 118 | |
119 | - return ( $http . $_SERVER['HTTP_HOST'] . $uri . "/" ); |
|
119 | + return ($http.$_SERVER['HTTP_HOST'].$uri."/"); |
|
120 | 120 | |
121 | 121 | } |
122 | 122 |
@@ -66,10 +66,11 @@ discard block |
||
66 | 66 | |
67 | 67 | $regex = $this->readpath($folders); |
68 | 68 | |
69 | - if (isset($this->routes[$regex])) |
|
70 | - return $this->routes[$regex]; |
|
71 | - else |
|
72 | - return null; |
|
69 | + if (isset($this->routes[$regex])) { |
|
70 | + return $this->routes[$regex]; |
|
71 | + } else { |
|
72 | + return null; |
|
73 | + } |
|
73 | 74 | |
74 | 75 | } |
75 | 76 | |
@@ -79,7 +80,9 @@ discard block |
||
79 | 80 | |
80 | 81 | $regex = $this->readpath($folders); |
81 | 82 | |
82 | - if (isset($this->routes[$regex])) unset($this->routes[$regex]); |
|
83 | + if (isset($this->routes[$regex])) { |
|
84 | + unset($this->routes[$regex]); |
|
85 | + } |
|
83 | 86 | |
84 | 87 | } |
85 | 88 | |
@@ -97,7 +100,9 @@ discard block |
||
97 | 100 | |
98 | 101 | private function readpath($folders = array(), &$value = null, $regex = '') { |
99 | 102 | |
100 | - if (!empty($folders) && empty($folders[0])) array_shift($folders); |
|
103 | + if (!empty($folders) && empty($folders[0])) { |
|
104 | + array_shift($folders); |
|
105 | + } |
|
101 | 106 | |
102 | 107 | if (empty($folders)) { |
103 | 108 |
@@ -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 |