Skip to content
This repository
Browse code

Fix coding standar errors in Routing/

  • Loading branch information...
commit 4640b8ea23d6a6fd946e65c699234a7f9b47d1e0 1 parent dc2f6ef
Mark Story authored March 03, 2012
6  lib/Cake/Routing/Dispatcher.php
@@ -64,8 +64,7 @@ public function __construct($base = false) {
64 64
  * @param CakeResponse $response Response object to put the results of the dispatch into.
65 65
  * @param array $additionalParams Settings array ("bare", "return") which is melded with the GET and POST params
66 66
  * @return boolean Success
67  
- * @throws MissingControllerException, MissingActionException, PrivateActionException if any of those error states
68  
- *    are encountered.
  67
+ * @throws MissingControllerException When the controller is missing.
69 68
  */
70 69
 	public function dispatch(CakeRequest $request, CakeResponse $response, $additionalParams = array()) {
71 70
 		if ($this->asset($request->url, $response) || $this->cached($request->here())) {
@@ -316,7 +315,7 @@ protected function _deliverAsset(CakeResponse $response, $assetFile, $ext) {
316 315
 		$response->send();
317 316
 		ob_clean();
318 317
 		if ($ext === 'css' || $ext === 'js') {
319  
-			include($assetFile);
  318
+			include $assetFile;
320 319
 		} else {
321 320
 			readfile($assetFile);
322 321
 		}
@@ -325,4 +324,5 @@ protected function _deliverAsset(CakeResponse $response, $assetFile, $ext) {
325 324
 			ob_end_flush();
326 325
 		}
327 326
 	}
  327
+
328 328
 }
6  lib/Cake/Routing/Route/CakeRoute.php
@@ -185,7 +185,7 @@ public function parse($url) {
185 185
 			return false;
186 186
 		}
187 187
 		foreach ($this->defaults as $key => $val) {
188  
-			$key = (string) $key;
  188
+			$key = (string)$key;
189 189
 			if ($key[0] === '[' && preg_match('/^\[(\w+)\]$/', $key, $header)) {
190 190
 				if (isset($this->_headerMap[$header[1]])) {
191 191
 					$header = $this->_headerMap[$header[1]];
@@ -225,13 +225,13 @@ public function parse($url) {
225 225
 			}
226 226
 			$route[$key] = $value;
227 227
 		}
228  
-		
  228
+
229 229
 		foreach ($this->keys as $key) {
230 230
 			if (isset($route[$key])) {
231 231
 				$route[$key] = rawurldecode($route[$key]);
232 232
 			}
233 233
 		}
234  
-		
  234
+
235 235
 		if (isset($route['_args_'])) {
236 236
 			list($pass, $named) = $this->_parseArgs($route['_args_'], $route);
237 237
 			$route['pass'] = array_merge($route['pass'], $pass);
3  lib/Cake/Routing/Route/PluginShortRoute.php
@@ -54,4 +54,5 @@ public function match($url) {
54 54
 		unset($this->defaults['controller']);
55 55
 		return $result;
56 56
 	}
57  
-}
  57
+
  58
+}
1  lib/Cake/Routing/Route/RedirectRoute.php
@@ -113,4 +113,5 @@ protected function _stop($code = 0) {
113 113
 			exit($code);
114 114
 		}
115 115
 	}
  116
+
116 117
 }

0 notes on commit 4640b8e

Please sign in to comment.
Something went wrong with that request. Please try again.