AlejandroPF / tight

src/Route.php

Braces +3 added lines, -2 removed lines

@@ -72,8 +72,9 @@
     }
 
     public function setCallable($callback) {
-        if (is_callable($callback))
-            $this->callable = $callback;
+        if (is_callable($callback)) {
+                    $this->callable = $callback;
+        }
     }
 
     /**

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
     private $argsPattern = "(\\w+)";
 
     public function __construct($pattern, $callable) {
-        $this->argsPattern = self::PARAMETER_CHARACTER . $this->argsPattern;
+        $this->argsPattern = self::PARAMETER_CHARACTER.$this->argsPattern;
         $this->setPattern($pattern);
         $this->setCallable($callable);
         $this->filterPattern();
@@ -71,13 +71,13 @@ 
         $pattern = $this->getPattern();
         $match = [];
         $pattern = str_replace("/", "\\/", $pattern);
-        if (preg_match_all("/" . $this->argsPattern . "/", $pattern, $match)) {
+        if (preg_match_all("/".$this->argsPattern."/", $pattern, $match)) {
             $strings = $match[0];
             $parameters = $match[1];
             $this->params = $parameters;
             $pattern = str_replace($strings, str_replace(self::PARAMETER_CHARACTER, "", $this->argsPattern), $pattern);
         }
-        $this->setPattern("/^" . $pattern . "$/");
+        $this->setPattern("/^".$pattern."$/");
     }
 
     public function setPattern($pattern) {

src/Utils.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
         // Get the substring after $substrToRemove
         $post = substr($string, $lastIndex);
         // Return $pre and $post
-        return $pre . $post;
+        return $pre.$post;
     }
 
     /**
@@ -77,7 +77,7 @@ 
     public static function addTrailingSlash($path) {
         if (null !== $path && is_string($path) && !empty($path)) {
             if (substr($path, -1) !== "/") {
-                $path .="/";
+                $path .= "/";
             }
         }
         return $path;
@@ -101,7 +101,7 @@ 
      * @return string
      */
     public static function removeDouble($string, $substring) {
-        return str_replace($substring . $substring, $substring, $string);
+        return str_replace($substring.$substring, $substring, $string);
     }
 
 }

tests/UtilsTest.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
     public function testUtilsAddTrailingSlash() {
         $path = "/etc/php5";
         $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path));
-        $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path . "/"));
+        $this->assertEquals("/etc/php5/", Utils::addTrailingSlash($path."/"));
     }
 
     /**
@@ -84,7 +84,7 @@ 
         $pathUnx = "/var/htdocs";
         $this->assertEquals("C:/php/ext/", Utils::filterPath($pathWin));
         $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx));
-        $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx . "/"));
+        $this->assertEquals("/var/htdocs/", Utils::filterPath($pathUnx."/"));
     }
 
     /**

src/Router.php

Doc Comments +2 added lines, -1 removed lines

@@ -115,7 +115,7 @@ 
      * 
      * This method need at least 2 arguments: route pattern and callable.
      * You can create midleware callables which will be executed before the route
-     * @return type
+     * @return Router
      */
     public function post() {
         return $this->url(Route::METHOD_POST, func_get_args());
@@ -198,6 +198,7 @@ 
 
     /**
      * Method called when route cant be found
+     * @param \Closure $callback
      */
     public function notFound($callback) {
         $this->errorHandler['notFound'] = $callback;

Spacing +3 added lines, -3 removed lines

@@ -171,7 +171,7 @@ 
         }
         $pattern = array_shift($args); // 1st index-> Pattern
         $callable = array_pop($args); // Last index-> callable
-        $route = new Route(Utils::removeDouble($this->basePath . $pattern, "/"), $callable);
+        $route = new Route(Utils::removeDouble($this->basePath.$pattern, "/"), $callable);
         $route->setHttpMethods($methods);
         if (count($args) > 0) {
             // Adds the middleware
@@ -240,14 +240,14 @@ 
      * @return string Request URN
      */
     public function getRequestUrn() {
-        $output = Utils::addTrailingSlash("/" . Utils::removeSubstring($_SERVER['REQUEST_URI'], $this->basePath));
+        $output = Utils::addTrailingSlash("/".Utils::removeSubstring($_SERVER['REQUEST_URI'], $this->basePath));
         return $output;
     }
 
     public function runMvc() {
         //@todo Create routes depending on the request URI using MVC
         $requestUrn = $this->getRequestUrn();
-        if("/" == $requestUrn){
+        if ("/" == $requestUrn) {
             $name = \Tight\Tight::getInstance()->getConfig()->mvc["indexName"];
             echo $name;
         }

tests/RouterTest.php

Spacing +17 added lines, -17 removed lines

@@ -43,13 +43,13 @@ 
             echo "Hello";
         });
         $this->router->get("/hello/:id", function($id) {
-            echo "Hello " . $id;
+            echo "Hello ".$id;
         });
         $this->router->post("/world/", function() {
             echo "world";
         });
         $this->router->post("/world/:id", function($id) {
-            echo $id . " world";
+            echo $id." world";
         });
         $this->router->map(["get", "post"], "/map/", function() {
             echo "map";
@@ -84,11 +84,11 @@ 
         $this->expectOutputString("Hello");
         $output .= "Hello";
         $this->router->dispatch("/hello/", "post");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
         $this->router->dispatch("/hello/world", "get");
-        $this->expectOutputString($output . "Hello world");
-        $output.="Hello world";
+        $this->expectOutputString($output."Hello world");
+        $output .= "Hello world";
     }
 
     /**
@@ -99,13 +99,13 @@ 
     public function testRouterPost() {
         $output = "";
         $this->router->dispatch("/world/", "post");
-        $this->expectOutputString($output . "world");
+        $this->expectOutputString($output."world");
         $output .= "world";
         $this->router->dispatch("/world/", "get");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
         $this->router->dispatch("/world/hello", "post");
-        $this->expectOutputString($output . "hello world");
+        $this->expectOutputString($output."hello world");
         $output .= "Hello world";
     }
 
@@ -118,13 +118,13 @@ 
     public function testRouterMap() {
         $output = "";
         $this->router->dispatch("/map/", "post");
-        $this->expectOutputString($output . "map");
+        $this->expectOutputString($output."map");
         $output .= "map";
         $this->router->dispatch("/map/", "get");
-        $this->expectOutputString($output . "map");
+        $this->expectOutputString($output."map");
         $output .= "map";
         $this->router->dispatch("/map/", "options");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
     }
 
@@ -136,10 +136,10 @@ 
     public function testRouteUpdate() {
         $output = "";
         $this->router->dispatch("/upd/", "update");
-        $this->expectOutputString($output . "upd");
+        $this->expectOutputString($output."upd");
         $output .= "upd";
         $this->router->dispatch("/upd/", "get");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
     }
 
@@ -151,10 +151,10 @@ 
     public function testRouteDelete() {
         $output = "";
         $this->router->dispatch("/del/", "delete");
-        $this->expectOutputString($output . "del");
+        $this->expectOutputString($output."del");
         $output .= "del";
         $this->router->dispatch("/del/", "post");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
     }
 
@@ -166,10 +166,10 @@ 
     public function testRouteMiddleware() {
         $output = "";
         $this->router->dispatch("/middle/", "get");
-        $this->expectOutputString($output . "mid1 mid2 end");
+        $this->expectOutputString($output."mid1 mid2 end");
         $output .= "mid1 mid2 end";
         $this->router->dispatch("/middle/", "post");
-        $this->expectOutputString($output . "Page not found");
+        $this->expectOutputString($output."Page not found");
         $output .= "Page not found";
     }
 

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-$_SERVER["DOCUMENT_ROOT"]="/var/www/";
-$_SERVER["REQUEST_METHOD"] ="GET";
-$_SERVER["REQUEST_URI"] ="/tests/";
+$_SERVER["DOCUMENT_ROOT"] = "/var/www/";
+$_SERVER["REQUEST_METHOD"] = "GET";
+$_SERVER["REQUEST_URI"] = "/tests/";
 require_once "./vendor/autoload.php";
\ No newline at end of file

src/Tight.php

Spacing +5 added lines, -5 removed lines

@@ -136,8 +136,8 @@ 
                     <body>
                         <h1>Tight Framework Exception</h1>
 EXC;
-        $output .= "<p><strong>" . get_class($ex) . ": </strong>" . $ex->getMessage() . "</p>";
-        $output .= "<p class='padding-left'>in <strong>" . $lastTrace['file'] . "</strong> at line <strong>" . $lastTrace['line'] . "</strong></p>";
+        $output .= "<p><strong>".get_class($ex).": </strong>".$ex->getMessage()."</p>";
+        $output .= "<p class='padding-left'>in <strong>".$lastTrace['file']."</strong> at line <strong>".$lastTrace['line']."</strong></p>";
         $output .= "<br/>";
         $output .= "<p>Stack Trace:</p>";
         $trace = $ex->getTrace();
@@ -146,9 +146,9 @@ 
             $class = isset($el["class"]) ? $el["class"] : "";
             $type = isset($el["type"]) ? $el["type"] : "";
             $func = isset($el["function"]) ? $el["function"] : "";
-            $file = isset($el["file"]) ? "at <strong>" . $el["file"] . "</strong>" : "";
-            $line = isset($el["line"]) ? "at line <strong>" . $el["line"] . "</strong>" : "";
-            $output .= "<p>#" . ($index + 1) . ": " . $class . $type . $func . "() ". $file .  $line . "</strong></p>";
+            $file = isset($el["file"]) ? "at <strong>".$el["file"]."</strong>" : "";
+            $line = isset($el["line"]) ? "at line <strong>".$el["line"]."</strong>" : "";
+            $output .= "<p>#".($index + 1).": ".$class.$type.$func."() ".$file.$line."</strong></p>";
         }
         echo $output;
     }