modulusphp · donaldp · Jun 8, 2019 · Jun 8, 2019 · Jun 8, 2019 · Jun 8, 2019
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "modulusphp/utility",
   "description": "Utility component for Modulus",
-  "version": "1.9.4.4",
+  "version": "1.9.4.5",
   "license": "MIT",
   "type": "package",
   "authors": [{
@@ -23,7 +23,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Modulus\\Utility\\": ""
+      "Modulus\\Utility\\": "src/"
     }
   },
   "minimum-stability": "stable"

diff --git a/Accessor.php → src/Accessor.php b/Accessor.php → src/Accessor.php
diff --git a/Command.php → src/Command.php b/Command.php → src/Command.php
diff --git a/Event.php → src/Event.php b/Event.php → src/Event.php
diff --git a/Events.php → src/Events.php b/Events.php → src/Events.php
diff --git a/GlobalVariables.php → src/GlobalVariables.php b/GlobalVariables.php → src/GlobalVariables.php
diff --git a/Groupable.php → src/Groupable.php b/Groupable.php → src/Groupable.php
diff --git a/Mail.php → src/Mail.php b/Mail.php → src/Mail.php
diff --git a/Middleware.php → src/Middleware.php b/Middleware.php → src/Middleware.php
diff --git a/Notification.php → src/Notification.php b/Notification.php → src/Notification.php
diff --git a/Plugin.php → src/Plugin.php b/Plugin.php → src/Plugin.php
diff --git a/Process.php → src/Process.php b/Process.php → src/Process.php
diff --git a/Reflect.php → src/Reflect.php b/Reflect.php → src/Reflect.php
@@ -5,10 +5,10 @@
 use ReflectionMethod;
 use ReflectionFunction;
 
-use Modulus\Http\Request;
+use Modulus\Http\Request\Base;
 use Modulus\Utility\Groupable;
-use Modulus\Framework\Mocks\RouteBinding;
 
+use Modulus\Framework\Mocks\RouteBinding;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 
@@ -20,7 +20,7 @@ class Reflect
   /**
    * $request
    *
-   * @var \Request
+   * @var \Modulus\Http\Request\Base
    */
   public static $request;
 
@@ -62,9 +62,8 @@ private function celebrate($params, $variables, $route, $i = 0, $args = []) : ar
 
       if (class_exists($class)) {
         $instance = new $class();
-        if ($instance instanceof Request) {
-          $data = array_merge($_POST, $_FILES);
-          $request = new $class($data);
+        if ($instance instanceof Base) {
+          $request = new $class();
 
           $args[$where] = $request;
 
@@ -129,7 +128,7 @@ private function hasRequest($params, $variables, $i = null) : array
   {
     foreach($params as $key => $param) {
       $class = '\\' . $param->getType();
-      if (class_exists($class) && new $class() instanceof Request) {
+      if (class_exists($class) && new $class() instanceof Base) {
         $i = $key;
       }
     }

diff --git a/RouteQuery.php → src/RouteQuery.php b/RouteQuery.php → src/RouteQuery.php
diff --git a/Scheduler.php → src/Scheduler.php b/Scheduler.php → src/Scheduler.php
diff --git a/Seeder.php → src/Seeder.php b/Seeder.php → src/Seeder.php
diff --git a/Validate.php → src/Validate.php b/Validate.php → src/Validate.php
diff --git a/Variable.php → src/Variable.php b/Variable.php → src/Variable.php
diff --git a/View.php → src/View.php b/View.php → src/View.php