Extract modularize functionality to separate package dependency

inxilpro · inxilpro · commit d660b362f917 · 2026-01-31T17:14:10.000-05:00
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
         "ext-simplexml": "*",
         "ext-dom": "*",
         "composer/composer": "^2.1",
-        "illuminate/support": "^11|^12|13.x-dev|dev-master|dev-main"
+        "illuminate/support": "^11|^12|13.x-dev|dev-master|dev-main",
+        "internachi/modularize": "^1.0"
     },
     "require-dev": {
         "orchestra/testbench": "^9.11|^10.0|dev-master|dev-main",
diff --git a/src/Console/Commands/Database/SeedCommand.php b/src/Console/Commands/Database/SeedCommand.php
@@ -3,7 +3,7 @@
 namespace InterNACHI\Modular\Console\Commands\Database;
 
 use Illuminate\Support\Str;
-use InterNACHI\Modular\Console\Commands\Modularize;
+use InterNACHI\Modularize\Modularize;
 
 class SeedCommand extends \Illuminate\Database\Console\Seeds\SeedCommand
 {
diff --git a/src/Console/Commands/Make/MakeCast.php b/src/Console/Commands/Make/MakeCast.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\CastMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeCast extends CastMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeChannel.php b/src/Console/Commands/Make/MakeChannel.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ChannelMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeChannel extends ChannelMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeCommand.php b/src/Console/Commands/Make/MakeCommand.php
@@ -4,10 +4,11 @@
 
 use Illuminate\Foundation\Console\ConsoleMakeCommand;
 use Illuminate\Support\Str;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeCommand extends ConsoleMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function replaceClass($stub, $name)
 	{
diff --git a/src/Console/Commands/Make/MakeComponent.php b/src/Console/Commands/Make/MakeComponent.php
@@ -3,10 +3,11 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ComponentMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeComponent extends ComponentMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function buildClass($name)
 	{
diff --git a/src/Console/Commands/Make/MakeController.php b/src/Console/Commands/Make/MakeController.php
@@ -4,11 +4,12 @@
 
 use Illuminate\Routing\Console\ControllerMakeCommand;
 use Illuminate\Support\Str;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 use InvalidArgumentException;
 
 class MakeController extends ControllerMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function parseModel($model)
 	{
diff --git a/src/Console/Commands/Make/MakeEvent.php b/src/Console/Commands/Make/MakeEvent.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\EventMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeEvent extends EventMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeException.php b/src/Console/Commands/Make/MakeException.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ExceptionMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeException extends ExceptionMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeFactory.php b/src/Console/Commands/Make/MakeFactory.php
@@ -4,10 +4,11 @@
 
 use Illuminate\Database\Console\Factories\FactoryMakeCommand;
 use Illuminate\Support\Str;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeFactory extends FactoryMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function replaceNamespace(&$stub, $name)
 	{
diff --git a/src/Console/Commands/Make/MakeJob.php b/src/Console/Commands/Make/MakeJob.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\JobMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeJob extends JobMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeListener.php b/src/Console/Commands/Make/MakeListener.php
@@ -5,10 +5,11 @@
 use Illuminate\Console\GeneratorCommand;
 use Illuminate\Foundation\Console\ListenerMakeCommand;
 use InterNACHI\Modular\Support\Facades\Modules;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeListener extends ListenerMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function buildClass($name)
 	{
diff --git a/src/Console/Commands/Make/MakeMail.php b/src/Console/Commands/Make/MakeMail.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\MailMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeMail extends MailMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeMiddleware.php b/src/Console/Commands/Make/MakeMiddleware.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Routing\Console\MiddlewareMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeMiddleware extends MiddlewareMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeMigration.php b/src/Console/Commands/Make/MakeMigration.php
@@ -4,10 +4,11 @@
 
 use Illuminate\Database\Console\Migrations\MigrateMakeCommand;
 use Illuminate\Filesystem\Filesystem;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeMigration extends MigrateMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function getMigrationPath()
 	{
diff --git a/src/Console/Commands/Make/MakeModel.php b/src/Console/Commands/Make/MakeModel.php
@@ -3,10 +3,11 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ModelMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeModel extends ModelMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 	
 	protected function getDefaultNamespace($rootNamespace)
 	{
diff --git a/src/Console/Commands/Make/MakeNotification.php b/src/Console/Commands/Make/MakeNotification.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\NotificationMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeNotification extends NotificationMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeObserver.php b/src/Console/Commands/Make/MakeObserver.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ObserverMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeObserver extends ObserverMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakePolicy.php b/src/Console/Commands/Make/MakePolicy.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\PolicyMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakePolicy extends PolicyMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeProvider.php b/src/Console/Commands/Make/MakeProvider.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ProviderMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeProvider extends ProviderMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeRequest.php b/src/Console/Commands/Make/MakeRequest.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\RequestMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeRequest extends RequestMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeResource.php b/src/Console/Commands/Make/MakeResource.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\ResourceMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeResource extends ResourceMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeRule.php b/src/Console/Commands/Make/MakeRule.php
@@ -3,8 +3,9 @@
 namespace InterNACHI\Modular\Console\Commands\Make;
 
 use Illuminate\Foundation\Console\RuleMakeCommand;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeRule extends RuleMakeCommand
 {
-	use Modularize;
+	use ModularizeGeneratorCommand;
 }
diff --git a/src/Console/Commands/Make/MakeSeeder.php b/src/Console/Commands/Make/MakeSeeder.php
@@ -4,10 +4,11 @@
 
 use Illuminate\Database\Console\Seeds\SeederMakeCommand;
 use Illuminate\Support\Str;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeSeeder extends SeederMakeCommand
 {
-	use Modularize {
+	use ModularizeGeneratorCommand {
 		getPath as getModularPath;
 	}
 	
diff --git a/src/Console/Commands/Make/MakeTest.php b/src/Console/Commands/Make/MakeTest.php
@@ -4,10 +4,11 @@
 
 use Illuminate\Foundation\Console\TestMakeCommand;
 use Illuminate\Support\Str;
+use InterNACHI\Modularize\ModularizeGeneratorCommand;
 
 class MakeTest extends TestMakeCommand
 {
-	use Modularize {
+	use ModularizeGeneratorCommand {
 		getPath as getModularPath;
 	}
 	
diff --git a/src/Console/Commands/Make/Modularize.php b/src/Console/Commands/Make/Modularize.php
diff --git a/src/Console/Commands/Modularize.php b/src/Console/Commands/Modularize.php

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Database;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\Str;`
`6`		`-use InterNACHI\Modular\Console\Commands\Modularize;`
	`6`	`+use InterNACHI\Modularize\Modularize;`
`7`	`7`
`8`	`8`	`class SeedCommand extends \Illuminate\Database\Console\Seeds\SeedCommand`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Make;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\CastMakeCommand;`
	`6`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`6`	`7`
`7`	`8`	`class MakeCast extends CastMakeCommand`
`8`	`9`	`{`
`9`		`- use Modularize;`
	`10`	`+ use ModularizeGeneratorCommand;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Make;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\ChannelMakeCommand;`
	`6`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`6`	`7`
`7`	`8`	`class MakeChannel extends ChannelMakeCommand`
`8`	`9`	`{`
`9`		`- use Modularize;`
	`10`	`+ use ModularizeGeneratorCommand;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\ConsoleMakeCommand;`
`6`	`6`	`use Illuminate\Support\Str;`
	`7`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`7`	`8`
`8`	`9`	`class MakeCommand extends ConsoleMakeCommand`
`9`	`10`	`{`
`10`		`- use Modularize;`
	`11`	`+ use ModularizeGeneratorCommand;`
`11`	`12`
`12`	`13`	`protected function replaceClass($stub, $name)`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,11 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Make;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\ComponentMakeCommand;`
	`6`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`6`	`7`
`7`	`8`	`class MakeComponent extends ComponentMakeCommand`
`8`	`9`	`{`
`9`		`- use Modularize;`
	`10`	`+ use ModularizeGeneratorCommand;`
`10`	`11`
`11`	`12`	`protected function buildClass($name)`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Routing\Console\ControllerMakeCommand;`
`6`	`6`	`use Illuminate\Support\Str;`
	`7`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`7`	`8`	`use InvalidArgumentException;`
`8`	`9`
`9`	`10`	`class MakeController extends ControllerMakeCommand`
`10`	`11`	`{`
`11`		`- use Modularize;`
	`12`	`+ use ModularizeGeneratorCommand;`
`12`	`13`
`13`	`14`	`protected function parseModel($model)`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Make;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\EventMakeCommand;`
	`6`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`6`	`7`
`7`	`8`	`class MakeEvent extends EventMakeCommand`
`8`	`9`	`{`
`9`		`- use Modularize;`
	`10`	`+ use ModularizeGeneratorCommand;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace InterNACHI\Modular\Console\Commands\Make;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Console\ExceptionMakeCommand;`
	`6`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`6`	`7`
`7`	`8`	`class MakeException extends ExceptionMakeCommand`
`8`	`9`	`{`
`9`		`- use Modularize;`
	`10`	`+ use ModularizeGeneratorCommand;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Console\Factories\FactoryMakeCommand;`
`6`	`6`	`use Illuminate\Support\Str;`
	`7`	`+use InterNACHI\Modularize\ModularizeGeneratorCommand;`
`7`	`8`
`8`	`9`	`class MakeFactory extends FactoryMakeCommand`
`9`	`10`	`{`
`10`		`- use Modularize;`
	`11`	`+ use ModularizeGeneratorCommand;`
`11`	`12`
`12`	`13`	`protected function replaceNamespace(&$stub, $name)`
`13`	`14`	`{`