Merge pull request #53 from Uxie-Framework/changing-to-single-repo

Changing implementation a single repo

App/App.php

@@ -1,9 +1,17 @@
 <?php
 
+/**
+ * Created Services that are critical to our application.
+ *
+ */
+
 container()->bind('Router', function() {
     return new Router\Router(rootDir().'/App/Routes.php');
 });
 
+container()->bind('Request', function() {
+    return new Request\Request();
+});
 container()->bind('Compiler', function() {
     return new Kernel\Compiler\Compiler();
 });

App/Middlewares/Csrf.php

@@ -8,8 +8,8 @@ class Csrf
 
     public function __construct()
     {
-        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-            $this->token = $_POST['_token'] ?? null;
+        if (container()->Request->getMethod() !== 'GET') {
+            $this->token = container()->Request->_token ?? null;
             $this->validateToken();
         }
     }

App/MiddlewaresLocator.php

@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Define Middlewares Locations
+ * This middlewares short names are the ones that should be used
+ * When calling a middleware on a route
+ *
+ */
+
 return [
     'statistics' => \Middleware\Statistics::class,
+    'csrf'       => \Middleware\Csrf::class,
 ];

App/Services.php

@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * Define services aliases and service providers
+ * that will be loaded On application start.
+ *
+ */
+
 return [
 
     'ServiceLocators' => [

Box

@@ -1,6 +1,6 @@
 <?php
 
-require_once '../Framework/vendor/autoload.php';
+require_once 'vendor/autoload.php';
 
 error_reporting(0);
 

composer.json

@@ -6,16 +6,9 @@
     "license":     "MIT",
 
     "require": {
-        "php":                         ">=7.2",
-        "uxie/router":                 ">=0.6.3",
-        "uxie/model":                  ">=0.2",
+        "php":                         ">=7.1.6",
+        "uxie/framework":              ">=0.0.3",
         "uxie/statistics":             ">=0.2",
-        "uxie/request-handler":        ">=0.4.1",
-        "uxie/validator":              ">=0.2",
-        "uxie/kernel":                 ">=0.2.3",
-        "uxie/authenticator":          ">=0.2",
-        "uxie/box":                    ">=0.2.2",
-        "uxie/services":               ">=0.1.5",
         "vlucas/phpdotenv":            ">=2.4",
         "mohamed-amine/file-uploader": ">=1.1",
         "mohamed-amine/ioc-container": ">=0.4",