Merge pull request #5 from zonneplan/release/1.3.0

Drop support for old Laravel versions

Author: rdgout

composer.json

@@ -12,16 +12,16 @@
     "license": "MIT",
     "authors": [],
     "require": {
-        "php": "^7.2.5",
-        "illuminate/console": "^6.0|^7.0|^8.0",
-        "illuminate/database": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/routing": "^6.0|^7.0|^8.0"
+        "php": "^7.4|^8.0",
+        "illuminate/console": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/support": "^8.0",
+        "illuminate/routing": "^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "^8.0",
-        "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^4.0"
+        "phpunit/phpunit": "^9.5",
+        "mockery/mockery": "^1.4",
+        "orchestra/testbench": "^6.0"
     },
     "autoload": {
         "psr-4": {

src/Module.php

@@ -3,7 +3,6 @@
 namespace Zonneplan\ModuleLoader;
 
 use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Gate;
@@ -22,29 +21,24 @@
 abstract class Module extends ServiceProvider implements ModuleContract
 {
     protected const ROUTE_FILE_TYPES = [
-        'routes', 'web', 'api',
+        'routes',
+        'web',
+        'api',
     ];
 
-    /** @var array */
-    protected $policies = [];
+    protected array $policies = [];
 
-    /** @var array */
-    protected $middleware = [];
+    protected array $middleware = [];
 
-    /** @var array */
-    protected $listen = [];
+    protected array $listen = [];
 
-    /** @var array */
-    protected $subscribe = [];
+    protected array $subscribe = [];
 
-    /** @var string */
-    protected $modulePath;
+    protected string $modulePath;
 
     /**
      * Register the module.
      *
-     * @throws ReflectionException
-     *
      * @return void
      */
     public function register(): void
@@ -56,9 +50,8 @@ public function register(): void
     /**
      * Boot the module.
      *
-     * @throws ReflectionException
-     *
      * @return void
+     * @throws ReflectionException
      */
     public function boot(): void
     {
@@ -91,8 +84,6 @@ protected function loadCommandSchedule(): void
     }
 
     /**
-     * @throws ReflectionException
-     *
      * @return void
      */
     protected function loadMigrations(): void
@@ -105,8 +96,6 @@ protected function loadMigrations(): void
     }
 
     /**
-     * @throws ReflectionException
-     *
      * @return void
      */
     protected function loadViews(): void
@@ -119,8 +108,6 @@ protected function loadViews(): void
     }
 
     /**
-     * @throws ReflectionException
-     *
      * @return void
      */
     protected function loadTranslations(): void
@@ -133,8 +120,6 @@ protected function loadTranslations(): void
     }
 
     /**
-     * @throws ReflectionException
-     *
      * @return void
      */
     protected function loadConfigs(): void
@@ -180,8 +165,6 @@ protected function registerListeners(): void
     }
 
     /**
-     * @throws ReflectionException
-     *
      * @return string
      */
     protected function getModulePath(): string
@@ -246,9 +229,8 @@ private function registerMiddleware(): void
      */
     private function registerFactories(): void
     {
-        $this->app->afterResolving(Factory::class, function (Factory $faker) {
-            $faker->load($this->getModulePath().'/Database/Factories');
-        });
+        // Unfortunately Laravel 8 no longer supports loading factories like this
+        // because they want you to use ModelFactories.
     }
 
     private function registerRoutes(): void

src/Support/ModuleRepository.php

@@ -12,8 +12,7 @@
  */
 class ModuleRepository implements ModuleRepositoryContract
 {
-    /** @var array */
-    protected $modules = [];
+    protected array $modules = [];
 
     /**
      * Registers a new module with a path.