Merge branch 'feature/upgrade-laravel-10' into 3.x

Author: impelevin

README.md

@@ -1,14 +1,14 @@
 ## Esensi Core Components Package
 
-> Version 1
+> Version 3
 
 An [Esensi](https://github.com/esensi) package, coded by [SiteRocket Labs®](https://www.siterocket.com).
 
 The `Esensi/Core` package is just one package that makes up [Esensi](https://github.com/esensi), a platform built on [Laravel](https://laravel.com). Esensi/Core is the foundational package for the other components package. This package provides core patterns and commonly extended base classes to all other packages of the Esensi platform. These components include an Laravel 8.x compatible HMVC pattern involving UI and API controller classes, an Eloquent model backed repository pattern, confirmed single and bulk actions and so much more. For more details on the inner workings and composition of the classes please consult the generously documented source code.
 
 ## Note
 
-This code is specifically designed to be compatible with the [Laravel Framework](https://laravel.com) and may not be compatible as a stand-alone dependency or as part of another framework. The current release of `Esensi/Core` also has some reliance on closed source code. Contact [[email protected]](https://www.siterocket.com/contact) if you would like to get access to these other repositories.
+This code is specifically designed to be compatible with the [Laravel Framework ^10](https://laravel.com) and may not be compatible as a stand-alone dependency or as part of another framework. The current release of `Esensi/Core` also has some reliance on closed source code. Contact [[email protected]](https://www.siterocket.com/contact) if you would like to get access to these other repositories.
 
 ## Quick Start
 

composer.json

@@ -23,14 +23,15 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.1",
         "laravelcollective/html": "^6.3",
-        "illuminate/support": "^8.0|^9.0"
+        "illuminate/support": "^10.0",
+        "esensi/loaders": "^v3.0.0"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.9.1",
-        "mockery/mockery": "^1.4.4",
-        "phpunit/phpunit": "^9.5.10",
+        "fakerphp/faker": "^1.21",
+        "mockery/mockery": "^1.5.1",
+        "phpunit/phpunit": "^10.0.7",
         "phpspec/phpspec": "^7.2"
     },
     "autoload": {

src/Providers/RouteServiceProvider.php

@@ -86,10 +86,12 @@ protected function bindPatterns()
      */
     protected function mapControllers()
     {
-        $path = $this->routesPath();
-        foreach ($this->controllers as $ui => $namespace) {
-            $this->groupRoutesByNamespace($namespace, $ui);
-        }
+        Route::middleware('web')
+            ->group(function () {
+                foreach ($this->controllers as $ui => $namespace) {
+                    $this->groupRoutesByNamespace($namespace, $ui);
+                }
+            });
     }
 
     /**

src/Traits/ActivateableRepositoryTrait.php

@@ -71,7 +71,7 @@ public function deactivate($id)
         $object->activated_at = null;
 
         // Validate the resource
-        if ($object->isInvalid('deactivating') || !$object->save()) {
+        if ($object->isInvalid('deactivating') || !$object->saveQuietly()) {
             $this->throwException($object->getErrors(), $this->error('deactivate'));
         }