AlejandroPF /
tight
@@ -72,8 +72,9 @@ |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | public function setCallable($callback) { |
| 75 | - if (is_callable($callback)) |
|
| 76 | - $this->callable = $callback; |
|
| 75 | + if (is_callable($callback)) { |
|
| 76 | + $this->callable = $callback; |
|
| 77 | + } |
|
| 77 | 78 | } |
| 78 | 79 | |
| 79 | 80 | /** |
@@ -58,6 +58,9 @@ |
||
| 58 | 58 | protected $pattern = ""; |
| 59 | 59 | protected $callable; |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $pattern |
|
| 63 | + */ |
|
| 61 | 64 | public function __construct($pattern, $callable) { |
| 62 | 65 | $this->setPattern($pattern); |
| 63 | 66 | $this->setCallable($callable); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | protected $pattern = ""; |
| 60 | 60 | protected $callable; |
| 61 | - private $argsPattern = self::PARAMETER_CHARACTER . "(\\w+)"; |
|
| 61 | + private $argsPattern = self::PARAMETER_CHARACTER."(\\w+)"; |
|
| 62 | 62 | |
| 63 | 63 | public function __construct($pattern, $callable) { |
| 64 | 64 | $this->setPattern($pattern); |
@@ -70,13 +70,13 @@ discard block |
||
| 70 | 70 | $pattern = $this->getPattern(); |
| 71 | 71 | $match = []; |
| 72 | 72 | $pattern = str_replace("/", "\\/", $pattern); |
| 73 | - if (preg_match_all("/" . $this->argsPattern . "/", $pattern, $match)) { |
|
| 73 | + if (preg_match_all("/".$this->argsPattern."/", $pattern, $match)) { |
|
| 74 | 74 | $strings = $match[0]; |
| 75 | 75 | $parameters = $match[1]; |
| 76 | 76 | $this->params = $parameters; |
| 77 | 77 | $pattern = str_replace($strings, str_replace(self::PARAMETER_CHARACTER, "", $this->argsPattern), $pattern); |
| 78 | 78 | } |
| 79 | - $this->setPattern("/^" . $pattern . "$/"); |
|
| 79 | + $this->setPattern("/^".$pattern."$/"); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | public function setPattern($pattern) { |
@@ -89,14 +89,14 @@ |
||
| 89 | 89 | <body> |
| 90 | 90 | <h1>Tight Framework Exception</h1> |
| 91 | 91 | EXC; |
| 92 | - $output .= "<p><strong>" . get_class($ex) . ": </strong>" . $ex->getMessage() . "</p>"; |
|
| 93 | - $output .= "<p class='padding-left'>in <strong>" . $lastTrace['file'] . "</strong> at line <strong>" . $lastTrace['line'] . "</strong></p>"; |
|
| 92 | + $output .= "<p><strong>".get_class($ex).": </strong>".$ex->getMessage()."</p>"; |
|
| 93 | + $output .= "<p class='padding-left'>in <strong>".$lastTrace['file']."</strong> at line <strong>".$lastTrace['line']."</strong></p>"; |
|
| 94 | 94 | $output .= "<br/>"; |
| 95 | 95 | $output .= "<p>Stack Trace:</p>"; |
| 96 | 96 | $trace = $ex->getTrace(); |
| 97 | 97 | for ($index = 0; $index < count($trace); $index++) { |
| 98 | 98 | $el = $trace[$index]; |
| 99 | - $output .= "<p>#" . ($index + 1) . ": " . $el['class'] . $el['type'] . $el['function'] . "() at <strong>" . $el['file'] . "</strong> at line <strong>" . $el['line'] . "</strong></p>"; |
|
| 99 | + $output .= "<p>#".($index + 1).": ".$el['class'].$el['type'].$el['function']."() at <strong>".$el['file']."</strong> at line <strong>".$el['line']."</strong></p>"; |
|
| 100 | 100 | } |
| 101 | 101 | echo $output; |
| 102 | 102 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | // Get the substring after $substrToRemove |
| 54 | 54 | $post = substr($string, $lastIndex); |
| 55 | 55 | // Return $pre and $post |
| 56 | - return $pre . $post; |
|
| 56 | + return $pre.$post; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public static function addTrailingSlash($path) { |
| 78 | 78 | if (null !== $path && is_string($path) && !empty($path)) { |
| 79 | 79 | if (substr($path, -1) !== "/") { |
| 80 | - $path .="/"; |
|
| 80 | + $path .= "/"; |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | return $path; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @return string |
| 102 | 102 | */ |
| 103 | 103 | public static function removeDouble($string, $substring) { |
| 104 | - return str_replace($substring . $substring, $substring, $string); |
|
| 104 | + return str_replace($substring.$substring, $substring, $string); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | } |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | } |
| 88 | 88 | $pattern = array_shift($args); // 2nd-> Pattern |
| 89 | 89 | $callable = array_pop($args); // Last -> callable |
| 90 | - $route = new Route(Utils::removeDouble($this->basePath . $pattern, "/"), $callable); |
|
| 90 | + $route = new Route(Utils::removeDouble($this->basePath.$pattern, "/"), $callable); |
|
| 91 | 91 | $route->setHttpMethods($methods); |
| 92 | 92 | if (count($args) > 0) { |
| 93 | 93 | $route->setMiddleware($args); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function testUtilsAddTrailingSlash() { |
| 74 | 74 | $path = "/etc/php5"; |
| 75 | 75 | $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path)); |
| 76 | - $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path . "/")); |
|
| 76 | + $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path."/")); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $pathUnx = "/var/htdocs"; |
| 85 | 85 | $this->assertEquals("C:/php/ext/", Utils::filterPath($pathWin)); |
| 86 | 86 | $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx)); |
| 87 | - $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx . "/")); |
|
| 87 | + $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx."/")); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
