Merge pull request #7 from zonneplan/feature/support-laravel-9

rdgout · web-flow · commit 4f40547c2eae · 2022-02-24T14:17:53.000+01:00
Support Laravel 9
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ composer.lock
 phpunit.xml
 .env
 .idea
-.phpunit.result.cache
+.phpunit.result.cache
+.DS_Store
diff --git a/README.md b/README.md
@@ -5,6 +5,14 @@
 [![Build Status](https://img.shields.io/travis/zonneplan/laravel-module-loader/master.svg?style=flat-square)](https://travis-ci.org/zonneplan/laravel-module-loader)
 [![Total Downloads](https://img.shields.io/packagist/dt/zonneplan/laravel-module-loader.svg?style=flat-square)](https://packagist.org/packages/zonneplan/laravel-module-loader)
 
+| **Laravel**  | **laravel-module-loader** |
+|---|---------------------------|
+| 5.8  | ^1.0                      |
+| 6.0  | ^1.0                      |
+| 7.0  | ^1.0                      |
+| 8.0  | ^2.0                      |
+| 9.0  | ^3.0                      |
+
 The `zonneplan/laravel-module-loader` package provides an easy to use module loader 
 which can be used to modulize your project.
 
diff --git a/composer.json b/composer.json
@@ -12,16 +12,16 @@
     "license": "MIT",
     "authors": [],
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/console": "^8.0",
-        "illuminate/database": "^8.0",
-        "illuminate/support": "^8.0",
-        "illuminate/routing": "^8.0"
+        "php": "^8.0",
+        "illuminate/console": "^9.0",
+        "illuminate/database": "^9.0",
+        "illuminate/support": "^9.0",
+        "illuminate/routing": "^9.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^6.0"
+        "orchestra/testbench": "^7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Module.php b/src/Module.php
@@ -36,6 +36,8 @@ abstract class Module extends ServiceProvider implements ModuleContract
 
     protected ?string $modulePath = null;
 
+    protected bool $enableLegacyFactoryLoading = false;
+
     /**
      * Register the module.
      *
@@ -230,6 +232,7 @@ private function registerMiddleware(): void
     private function registerFactories(): void
     {
         if (
+            $this->enableLegacyFactoryLoading &&
             method_exists($this, 'loadFactoriesFrom') &&
             file_exists($this->getModulePath().'/Database/Factories')
         ) {
diff --git a/src/ModulesServiceProvider.php b/src/ModulesServiceProvider.php
@@ -17,9 +17,7 @@ class ModulesServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        $this->app->singleton(ModuleRepositoryContract::class, static function () {
-            return new ModuleRepository();
-        });
+        $this->app->singleton(ModuleRepositoryContract::class, ModuleRepository::class);
     }
 
     /**
diff --git a/tests/Support/ModuleRepositoryTest.php b/tests/Support/ModuleRepositoryTest.php
@@ -4,12 +4,12 @@
 
 use Zonneplan\ModuleLoader\Support\Contracts\ModuleRepositoryContract;
 use Zonneplan\ModuleLoader\Support\Exceptions\ModuleNotFoundException;
+use Zonneplan\ModuleLoader\Support\ModuleRepository;
 use Zonneplan\ModuleLoader\Test\TestCase;
 
 class ModuleRepositoryTest extends TestCase
 {
-    /* @var ModuleRepository */
-    protected $moduleRepository;
+    protected ModuleRepository $moduleRepository;
 
     public function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ abstract class Module extends ServiceProvider implements ModuleContract`
`36`	`36`
`37`	`37`	`protected ?string $modulePath = null;`
`38`	`38`
	`39`	`+ protected bool $enableLegacyFactoryLoading = false;`
	`40`	`+`
`39`	`41`	`/**`
`40`	`42`	`* Register the module.`
`41`	`43`	`*`
`@@ -230,6 +232,7 @@ private function registerMiddleware(): void`
`230`	`232`	`private function registerFactories(): void`
`231`	`233`	`{`
`232`	`234`	`if (`
	`235`	`+ $this->enableLegacyFactoryLoading &&`
`233`	`236`	`method_exists($this, 'loadFactoriesFrom') &&`
`234`	`237`	`file_exists($this->getModulePath().'/Database/Factories')`
`235`	`238`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,7 @@ class ModulesServiceProvider extends ServiceProvider`
`17`	`17`	`*/`
`18`	`18`	`public function register(): void`
`19`	`19`	`{`
`20`		`- $this->app->singleton(ModuleRepositoryContract::class, static function () {`
`21`		`- return new ModuleRepository();`
`22`		`- });`
	`20`	`+ $this->app->singleton(ModuleRepositoryContract::class, ModuleRepository::class);`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`
`5`	`5`	`use Zonneplan\ModuleLoader\Support\Contracts\ModuleRepositoryContract;`
`6`	`6`	`use Zonneplan\ModuleLoader\Support\Exceptions\ModuleNotFoundException;`
	`7`	`+use Zonneplan\ModuleLoader\Support\ModuleRepository;`
`7`	`8`	`use Zonneplan\ModuleLoader\Test\TestCase;`
`8`	`9`
`9`	`10`	`class ModuleRepositoryTest extends TestCase`
`10`	`11`	`{`
`11`		`- /* @var ModuleRepository */`
`12`		`- protected $moduleRepository;`
	`12`	`+ protected ModuleRepository $moduleRepository;`
`13`	`13`
`14`	`14`	`public function setUp(): void`
`15`	`15`	`{`