Merge pull request #46 from Lemon-Framework/master

v2 changes develped in master

.gitignore

@@ -1,3 +1,4 @@
 /testing/
 /vendor/
 **/*.swp
+.phpunit.result.cache

README.md

@@ -26,3 +26,7 @@ your_project/
 
 ```
 If you want to build bigger starting app, type `php lemonade build type:project`
+
+# Contributing
+
+Any contributions that don't rewrite whole framework are welcomend. But please use latest develop branch. (Currently [v3-develop](https://github.com/Lemon-Framework/Lemon/tree/v3-develop))

src/Exceptions/ViewException.php

@@ -4,4 +4,4 @@
 
 class ViewException extends \Exception {}
 
-?>
+

src/Http/MiddlewareCollection.php

@@ -22,9 +22,9 @@ public function __construct($middlewares=[])
      * @param String|Array $middlewares
      */
     public function add($middlewares)
-    {
+    { 
         $parsed = $this->parse($middlewares);
-        array_push($this->middlewares, $parsed);
+        $this->middlewares = array_merge($this->middlewares, $parsed); 
         return $this;
     }
 
@@ -36,13 +36,13 @@ public function add($middlewares)
      */
     private function parse($middlewares)
     {
-        if (gettype($this->middlewares) == "string")
-            return explode("|", $this->middlewares);
+        if (is_string($middlewares))
+            return explode("|", $middlewares);
         return $middlewares;
     }
 
     /**
-     * Executes given midlewares
+     * Executes given middlewares
      *
      * @param Request $request
      */
@@ -70,4 +70,3 @@ public function terminate(Request $request)
     } 
 }
 
-?>

src/Http/Request.php

@@ -109,4 +109,4 @@ function header($name)
 
 }
 
-?>
+

src/Http/Response.php

@@ -146,20 +146,20 @@ private function handleBody()
             return;
         }
 
-        if (gettype($body) == "array")
+        if (is_array($body))
         {
             header("Content-type:application/json");
             echo json_encode($body);
             return;
         }
 
-        if (gettype($body) != "object")
+        if (!is_object($body))
             return;
 
-        if (get_class($body) == "Lemon\Http\Response")
+        if ($body instanceof Response)
             $body->terminate();
 
-        if (get_class($body) == "Lemon\Views\View")
+        if ($body instanceof \Lemon\Views\View)
         {
             extract($body->arguments);
             eval($body->compiled_template);
@@ -171,7 +171,7 @@ private function handleBody()
      * Sets status code handler
      *
      * @param int $code
-     * @param Closure|String $callback|$function_name
+     * @param Closure|String $action
      *
      * */
     static function handle(int $code, $action)
@@ -181,4 +181,4 @@ static function handle(int $code, $action)
 
 }
 
-?>
+

src/Http/Routing/Dispatcher.php

@@ -38,7 +38,7 @@ public function __construct(Array $routes)
      */
     private function parseGet()
     {
-        if (preg_match("/\\?(.+)/", $this->request_uri, $matches) == 1)
+        if (preg_match("/\\?(.+)/", $this->request_uri, $matches) === 1)
         {
             $this->request_uri = str_replace("{$matches[0]}", "", $this->request_uri);
             parse_str($matches[1], $get_args);
@@ -109,4 +109,4 @@ public function run()
     }
 }
 
-?>
+

src/Http/Routing/Helpers.php

@@ -21,11 +21,11 @@ function getParamTypes($callback)
         $type = $param->getType();
         if (!$type)
             $type = "mixed";
-        $types[array_search($param, $params)] = gettype($type) == "string" ? $type : $type->__toString();
+        $types[array_search($param, $params)] = is_string($type) ? $type : $type->__toString();
     }
 
     return $types;
 
 }
 
-?>
+

src/Http/Routing/Route.php

@@ -52,7 +52,7 @@ public function __construct(String $path, Array $methods, $action)
     /**
      * Adds new middleware
      * 
-     * @param String|Array $middleware_param
+     * @param String|Array $middlewares
      */
     public function middleware($middlewares)
     {
@@ -100,7 +100,7 @@ public function toResponse(Request $request, Array $params)
         $arguments = [];
         foreach ($param_types as $type)
         {
-            if ($type == "Lemon\Http\Request")
+            if ($type === "Lemon\Http\Request")
             {
                 array_push($arguments, $request);
                 continue;
@@ -120,4 +120,3 @@ public function toResponse(Request $request, Array $params)
     }
 }
 
-?>

src/Http/Routing/RouteCore.php

@@ -33,13 +33,13 @@ class RouteCore
      *
      * @param String $path
      * @param Array $methods
-     * @param Closure|String|Array
+     * @param Closure|String|Array $action
      *
      * @return Route
      */
     static function createRoute(String $path, Array $methods, $action)
     {  
-        if (gettype($action) == "string")
+        if (is_string($action))
         {
             $action = explode(":", $action);
             if (!isset($action[1]))
@@ -146,7 +146,7 @@ public static function controller(String $base, String $controller)
     public static function byName(String $name)
     {
         foreach (self::$routes as $route)
-            if ($route->name == $name)
+            if ($route->name === $name)
                 return $route;
     }
 
@@ -170,4 +170,4 @@ public static function execute()
     }
 }
 
-?>
+

src/Http/Routing/RouteGroup.php

@@ -30,19 +30,24 @@ class RouteGroup
      */
     public $routes;
 
+    /**
+     * Positions that will get unset after parsing
+     */
+    public $unset_positions;
 
     public function __construct(Array $parameters, Array $routes)
     {
-        $this->name = isset($parameters["name"]) ? $parameters["name"] : "";
-        $this->middlewares = isset($parameters["middlewares"]) ? $parameters["middlewares"] : []; 
-        $this->prefix = isset($parameters["prefix"]) ? $parameters["prefix"] : "/"; 
+        $this->name = $parameters["name"] ?? "";
+        $this->middlewares = $parameters["middlewares"] ?? [];
+        $this->prefix = $parameters["prefix"] ?? "/";
         $this->routes = $routes;
+        $this->unset_positions = [];
         $this->resolve();
         $this->update();
     }
 
     /**
-     * Resolves nested route groups and arrays of routes
+     * Resolves nested route groups and arays of routes
      */ 
     public function resolve()
     {
@@ -51,17 +56,20 @@ public function resolve()
             if (is_array($route))
                 $this->resolveRoute($pos, $route);
 
-            else if (get_class($route) == "Lemon\Http\Routing\RouteGroup")
+            else if ($route instanceof \Lemon\Http\Routing\RouteGroup)
                 $this->resolveRoute($pos, $route->routes);
         }
+
+        foreach ($this->unset_positions as $position)
+            unset($this->routes[$position]);
     }
 
     /**
      * Resolves routes that aren't Route instance
      */
     public function resolveRoute($pos, $routes)
     {
-        unset($this->routes[$pos]);
+        array_push($this->unset_positions, $pos);
         $this->routes = array_merge($this->routes, $routes);
     }
 
@@ -81,4 +89,3 @@ public function update()
 
 
 }
-

src/Kernel/Application.php

@@ -73,4 +73,4 @@ public function boot()
     }
 }
 
-?>
+

src/Kernel/Lemonade/Builders/builder.php

@@ -134,4 +134,4 @@ function build($arguments)
     $builder->execute();
 }
 
-?>
+

src/Kernel/Lemonade/Builders/licenses.php

@@ -44,7 +44,7 @@ private function licenseType()
             return;
         }
 
-        if ($type == "custom")
+        if ($type === "custom")
         {
             $license = readline("Type your license content: ");
             $this->parameters["license"] = $license;
@@ -103,4 +103,4 @@ public function buildLicense()
 
 }
 
-?>
+

src/Kernel/Lemonade/Builders/templates.php

@@ -39,4 +39,4 @@
     "mit" => "https://raw.githubusercontent.com/Lemon-Framework/Examples/master/templates/licences/mit.txt",
     "apache" => "https://raw.githubusercontent.com/Lemon-Framework/Examples/master/templates/licences/apache.txt"
 ];
-?>
+

src/Kernel/Lemonade/Helpers/commands.php

@@ -20,4 +20,4 @@
     "repl" => "repl"
 
 ];
-?>
+

src/Kernel/Lemonade/Helpers/helpers.php

@@ -6,4 +6,4 @@ function textFormat($text, $color)
    return "\033[{$color}m{$text}\033[0m";
 }
 
-?>
+

src/Kernel/Lemonade/Helpers/info.php

@@ -45,4 +45,4 @@ function version()
     echo "\n->{$version}\n";
 }
 
-?>
+

src/Kernel/Lemonade/Kernel.php

@@ -24,7 +24,7 @@ public function __construct($command, $directory)
 
     public function execute()
     {
-        $command = isset($this->command[1]) ?  $this->command[1] : "";
+        $command = $this->command[1] ?? "";
         $arguments = array_slice($this->command, 2);
         $commands = COMMANDS;
         isset($commands[$command]) ? $commands[$command]($arguments, $this->directory) : $commands["-h"]();
@@ -33,4 +33,4 @@ public function execute()
 
 }
 
-?>
+

src/Kernel/Lemonade/Repl/repl.php

@@ -123,4 +123,4 @@ function repl($arguments, $directory)
     $repl->run($directory);
 }
 
-?>
+

src/Kernel/Lemonade/Server/server.php

@@ -55,8 +55,8 @@ private function build()
     {
         $arguments = $this->parse();
 
-        $address = isset($arguments['host']) ? $arguments['host'] : "localhost";
-        $port = isset($arguments['port']) ? $arguments['port'] : "8000";
+        $address = $arguments['host'] ?? "localhost";
+        $port = $arguments['port'] ?? "8000";
         $dir = $this->directory."/public/";
 
         $command = "php -S {$address}:{$port} -t {$dir}";
@@ -95,4 +95,4 @@ function serve($arguments, $directory)
     $server->run();
 }
 
-?>
+

src/Kernel/loader.php

@@ -1,9 +1,9 @@
 <?php
 /**
  * Loads all files from specific folder
- * Inspired by loader from CoolFido 
- * 
- * @param String $dirname
+ * Inspired by loader from CoolFido
+ *
+ * @param String $dir
  *
  */
  function loader(String $dir)
@@ -22,4 +22,4 @@ function loader(String $dir)
      }
  }
 
-?>
+

src/Sessions/Csrf.php

@@ -14,7 +14,7 @@ class Csrf
      */
     static function setToken()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
+        if ($_SERVER["REQUEST_METHOD"] === "GET")
         {
             $token = uniqid();
             $token = hash("sha256", $token);
@@ -32,7 +32,7 @@ static function check()
         {
             if (isset($_POST["csrf_token"]) && isset($_SESSION["csrf_token"]))
             {
-                if ($_POST["csrf_token"] != $_SESSION["csrf_token"])
+                if ($_POST["csrf_token"] !== $_SESSION["csrf_token"])
                 {
                     Response::raise(400);
                     exit();
@@ -53,7 +53,7 @@ static function check()
      */
     static function getToken()
     {
-        return isset($_SESSION["csrf_token"]) ? $_SESSION["csrf_token"] : "";
+        return $_SESSION["csrf_token"] ?? "";
     }
 }
-?>
+

src/Sessions/Session.php

@@ -34,4 +34,4 @@ static function start()
     }
 }
 
-?>
+

src/Utils/Env.php

@@ -115,4 +115,4 @@ public static function all()
 
 }
 
-?>
+