Folder and files restructuring

santigarcor · Sep 15, 2017 · ccf7b81 · ccf7b81
1 parent 4f128e6
commit ccf7b81
Show file tree

Hide file tree

Showing 40 changed files with 41 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -23,11 +23,8 @@
         "phpunit/phpunit": "~4.1"
     },
     "autoload": {
-        "classmap": [
-            "src/commands"
-        ],
         "psr-4": {
-            "Laratrust\\": "src/Laratrust/"
+            "Laratrust\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/...mands/AddLaratrustUserTraitUseCommand.php → ...mands/AddLaratrustUserTraitUseCommand.php b/...mands/AddLaratrustUserTraitUseCommand.php → ...mands/AddLaratrustUserTraitUseCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/commands/MakePermissionCommand.php → src/Commands/MakePermissionCommand.php b/src/commands/MakePermissionCommand.php → src/Commands/MakePermissionCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/commands/MakeRoleCommand.php → src/Commands/MakeRoleCommand.php b/src/commands/MakeRoleCommand.php → src/Commands/MakeRoleCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,
@@ -66,7 +66,7 @@ protected function getDefaultNamespace($rootNamespace)
     {
         return $rootNamespace;
     }
-    
+
     /**
      * Get the console command arguments.
      *

diff --git a/src/commands/MakeSeederCommand.php → src/Commands/MakeSeederCommand.php b/src/commands/MakeSeederCommand.php → src/Commands/MakeSeederCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,
@@ -73,7 +73,7 @@ protected function createSeeder()
         $user = new Collection(Config::get('laratrust.user_models', ['App\User']));
         $user = $user->first();
 
-        $output = $this->laravel->view->make('laratrust::generators.seeder')
+        $output = $this->laravel->view->make('laratrust::seeder')
             ->with(compact([
                 'role',
                 'permission',

diff --git a/src/commands/MakeTeamCommand.php → src/Commands/MakeTeamCommand.php b/src/commands/MakeTeamCommand.php → src/Commands/MakeTeamCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/commands/MigrationCommand.php → src/Commands/MigrationCommand.php b/src/commands/MigrationCommand.php → src/Commands/MigrationCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,
@@ -57,7 +57,7 @@ public function handle()
 
         if ($existingMigrations) {
             $this->line('');
-            
+
             $this->warn($this->getExistingMigrationsWarning($existingMigrations));
         }
 
@@ -93,7 +93,7 @@ protected function createMigration()
         $migrationPath = $this->getMigrationPath();
 
         $output = $this->laravel->view
-            ->make('laratrust::generators.migration')
+            ->make('laratrust::migration')
             ->with(['laratrust' => Config::get('laratrust')])
             ->render();
 

diff --git a/src/commands/SetupCommand.php → src/Commands/SetupCommand.php b/src/commands/SetupCommand.php → src/Commands/SetupCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/commands/SetupTeamsCommand.php → src/Commands/SetupTeamsCommand.php b/src/commands/SetupTeamsCommand.php → src/Commands/SetupTeamsCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,
@@ -58,7 +58,7 @@ public function handle()
 
         if ($existingMigrations) {
             $this->line('');
-            
+
             $this->warn($this->getExistingMigrationsWarning($existingMigrations));
         }
 
@@ -98,7 +98,7 @@ protected function createMigration()
 
         $this->call('view:clear');
         $output = $this->laravel->view
-            ->make('laratrust::generators.setup-teams')
+            ->make('laratrust::setup-teams')
             ->with(['laratrust' => Config::get('laratrust')])
             ->render();
 

diff --git a/src/commands/UpgradeCommand.php → src/Commands/UpgradeCommand.php b/src/commands/UpgradeCommand.php → src/Commands/UpgradeCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Commands;
 
 /**
  * This file is part of Laratrust,
@@ -52,7 +52,7 @@ public function handle()
 
         if ($existingMigrations) {
             $this->line('');
-            
+
             $this->warn($this->getExistingMigrationsWarning($existingMigrations));
         }
 
@@ -89,7 +89,7 @@ protected function createMigration()
 
         $this->call('view:clear');
         $output = $this->laravel->view
-            ->make('laratrust::generators.upgrade-migration')
+            ->make('laratrust::upgrade-migration')
             ->with(['laratrust' => Config::get('laratrust')])
             ->render();
 

diff --git a/src/commands/stubs/permission.stub → src/Commands/stubs/permission.stub b/src/commands/stubs/permission.stub → src/Commands/stubs/permission.stub
diff --git a/src/commands/stubs/role.stub → src/Commands/stubs/role.stub b/src/commands/stubs/role.stub → src/Commands/stubs/role.stub
diff --git a/src/commands/stubs/team.stub → src/Commands/stubs/team.stub b/src/commands/stubs/team.stub → src/Commands/stubs/team.stub
diff --git a/...ontracts/LaratrustPermissionInterface.php → ...ontracts/LaratrustPermissionInterface.php b/...ontracts/LaratrustPermissionInterface.php → ...ontracts/LaratrustPermissionInterface.php
diff --git a/...rust/Contracts/LaratrustRoleInterface.php → src/Contracts/LaratrustRoleInterface.php b/...rust/Contracts/LaratrustRoleInterface.php → src/Contracts/LaratrustRoleInterface.php
diff --git a/...rust/Contracts/LaratrustTeamInterface.php → src/Contracts/LaratrustTeamInterface.php b/...rust/Contracts/LaratrustTeamInterface.php → src/Contracts/LaratrustTeamInterface.php
diff --git a/...rust/Contracts/LaratrustUserInterface.php → src/Contracts/LaratrustUserInterface.php b/...rust/Contracts/LaratrustUserInterface.php → src/Contracts/LaratrustUserInterface.php
diff --git a/src/Laratrust/Contracts/Ownable.php → src/Contracts/Ownable.php b/src/Laratrust/Contracts/Ownable.php → src/Contracts/Ownable.php
diff --git a/src/Laratrust/Laratrust.php → src/Laratrust.php b/src/Laratrust/Laratrust.php → src/Laratrust.php
diff --git a/src/Laratrust/LaratrustFacade.php → src/LaratrustFacade.php b/src/Laratrust/LaratrustFacade.php → src/LaratrustFacade.php
diff --git a/...ust/LaratrustRegistersBladeDirectives.php → src/LaratrustRegistersBladeDirectives.php b/...ust/LaratrustRegistersBladeDirectives.php → src/LaratrustRegistersBladeDirectives.php
diff --git a/src/Laratrust/LaratrustServiceProvider.php → src/LaratrustServiceProvider.php b/src/Laratrust/LaratrustServiceProvider.php → src/LaratrustServiceProvider.php
@@ -54,8 +54,8 @@ public function boot()
     {
         // Register published configuration.
         $this->publishes([
-            __DIR__.'/../config/laratrust.php' => config_path('laratrust.php'),
-            __DIR__.'/../config/laratrust_seeder.php' => config_path('laratrust_seeder.php'),
+            __DIR__.'/config/laratrust.php' => config_path('laratrust.php'),
+            __DIR__.'/config/laratrust_seeder.php' => config_path('laratrust_seeder.php'),
         ], 'laratrust');
 
         $this->useMorphMapForRelationships();
@@ -162,63 +162,63 @@ protected function registerCommands()
     protected function registerMigrationCommand()
     {
         $this->app->singleton('command.laratrust.migration', function () {
-            return new MigrationCommand();
+            return new \Laratrust\Commands\MigrationCommand();
         });
     }
 
     protected function registerMakeRoleCommand()
     {
         $this->app->singleton('command.laratrust.role', function ($app) {
-            return new MakeRoleCommand($app['files']);
+            return new \Laratrust\Commands\MakeRoleCommand($app['files']);
         });
     }
 
     protected function registerMakePermissionCommand()
     {
         $this->app->singleton('command.laratrust.permission', function ($app) {
-            return new MakePermissionCommand($app['files']);
+            return new \Laratrust\Commands\MakePermissionCommand($app['files']);
         });
     }
 
     protected function registerMakeTeamCommand()
     {
         $this->app->singleton('command.laratrust.team', function ($app) {
-            return new MakeTeamCommand($app['files']);
+            return new \Laratrust\Commands\MakeTeamCommand($app['files']);
         });
     }
 
     protected function registerAddLaratrustUserTraitUseCommand()
     {
         $this->app->singleton('command.laratrust.add-trait', function () {
-            return new AddLaratrustUserTraitUseCommand();
+            return new \Laratrust\Commands\AddLaratrustUserTraitUseCommand();
         });
     }
 
     protected function registerSetupCommand()
     {
         $this->app->singleton('command.laratrust.setup', function () {
-            return new SetupCommand();
+            return new \Laratrust\Commands\SetupCommand();
         });
     }
 
     protected function registerSetupTeamsCommand()
     {
         $this->app->singleton('command.laratrust.setup-teams', function () {
-            return new SetupTeamsCommand();
+            return new \Laratrust\Commands\SetupTeamsCommand();
         });
     }
 
     protected function registerMakeSeederCommand()
     {
         $this->app->singleton('command.laratrust.seeder', function () {
-            return new MakeSeederCommand();
+            return new \Laratrust\Commands\MakeSeederCommand();
         });
     }
 
     protected function registerUpgradeCommand()
     {
         $this->app->singleton('command.laratrust.upgrade', function () {
-            return new UpgradeCommand();
+            return new \Laratrust\Commands\UpgradeCommand();
         });
     }
 
@@ -230,7 +230,7 @@ protected function registerUpgradeCommand()
     private function mergeConfig()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/laratrust.php',
+            __DIR__.'/config/laratrust.php',
             'laratrust'
         );
     }

diff --git a/...Laratrust/Middleware/LaratrustAbility.php → src/Middleware/LaratrustAbility.php b/...Laratrust/Middleware/LaratrustAbility.php → src/Middleware/LaratrustAbility.php
diff --git a/...atrust/Middleware/LaratrustMiddleware.php → src/Middleware/LaratrustMiddleware.php b/...atrust/Middleware/LaratrustMiddleware.php → src/Middleware/LaratrustMiddleware.php
diff --git a/...atrust/Middleware/LaratrustPermission.php → src/Middleware/LaratrustPermission.php b/...atrust/Middleware/LaratrustPermission.php → src/Middleware/LaratrustPermission.php
diff --git a/src/Laratrust/Middleware/LaratrustRole.php → src/Middleware/LaratrustRole.php b/src/Laratrust/Middleware/LaratrustRole.php → src/Middleware/LaratrustRole.php
diff --git a/src/Laratrust/LaratrustPermission.php → src/Models/LaratrustPermission.php b/src/Laratrust/LaratrustPermission.php → src/Models/LaratrustPermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Models;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/Laratrust/LaratrustRole.php → src/Models/LaratrustRole.php b/src/Laratrust/LaratrustRole.php → src/Models/LaratrustRole.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Models;
 
 /**
  * This file is part of Laratrust,

diff --git a/src/Laratrust/LaratrustTeam.php → src/Models/LaratrustTeam.php b/src/Laratrust/LaratrustTeam.php → src/Models/LaratrustTeam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Laratrust;
+namespace Laratrust\Models;
 
 /**
  * This file is part of Laratrust,

diff --git a/...ts/LaratrustDynamicUserRelationsCalls.php → ...ts/LaratrustDynamicUserRelationsCalls.php b/...ts/LaratrustDynamicUserRelationsCalls.php → ...ts/LaratrustDynamicUserRelationsCalls.php
diff --git a/...trust/Traits/LaratrustPermissionTrait.php → src/Traits/LaratrustPermissionTrait.php b/...trust/Traits/LaratrustPermissionTrait.php → src/Traits/LaratrustPermissionTrait.php
diff --git a/src/Laratrust/Traits/LaratrustRoleTrait.php → src/Traits/LaratrustRoleTrait.php b/src/Laratrust/Traits/LaratrustRoleTrait.php → src/Traits/LaratrustRoleTrait.php
diff --git a/src/Laratrust/Traits/LaratrustTeamTrait.php → src/Traits/LaratrustTeamTrait.php b/src/Laratrust/Traits/LaratrustTeamTrait.php → src/Traits/LaratrustTeamTrait.php
diff --git a/src/Laratrust/Traits/LaratrustUserTrait.php → src/Traits/LaratrustUserTrait.php b/src/Laratrust/Traits/LaratrustUserTrait.php → src/Traits/LaratrustUserTrait.php
diff --git a/src/views/generators/migration.blade.php → src/views/migration.blade.php b/src/views/generators/migration.blade.php → src/views/migration.blade.php
diff --git a/src/views/generators/seeder.blade.php → src/views/seeder.blade.php b/src/views/generators/seeder.blade.php → src/views/seeder.blade.php
diff --git a/src/views/generators/setup-teams.blade.php → src/views/setup-teams.blade.php b/src/views/generators/setup-teams.blade.php → src/views/setup-teams.blade.php
diff --git a/...ws/generators/upgrade-migration.blade.php → src/views/upgrade-migration.blade.php b/...ws/generators/upgrade-migration.blade.php → src/views/upgrade-migration.blade.php
diff --git a/tests/LaratrustRoleTest.php b/tests/LaratrustRoleTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Database\Eloquent\SoftDeletes;
+use Mockery as m;
+use Laratrust\Models\LaratrustRole;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
-use Laratrust\LaratrustRole;
-use Mockery as m;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class LaratrustRoleTest extends UserTest
 {

diff --git a/tests/UserTest.php b/tests/UserTest.php
@@ -31,7 +31,7 @@ public function tearDown()
 
     protected function mockPermission($permName, $team_id = null)
     {
-        $permMock = m::mock('Laratrust\Permission');
+        $permMock = m::mock('Laratrust\Models\Permission');
         $permMock->name = $permName;
         $permMock->display_name = ucwords(str_replace('_', ' ', $permName));
         $permMock->id = 1;
@@ -45,7 +45,7 @@ protected function mockPermission($permName, $team_id = null)
 
     protected function mockRole($roleName, $team_id = null)
     {
-        $roleMock = m::mock('Laratrust\LaratrustRole')->makePartial();
+        $roleMock = m::mock('Laratrust\Models\LaratrustRole')->makePartial();
 
         Config::shouldReceive('get')->with('laratrust.user_models')->andReturn([]);
         $roleMock->name = $roleName;
@@ -62,7 +62,9 @@ protected function mockRole($roleName, $team_id = null)
 
     protected function mockTeam($teamName)
     {
-        $teamMock = m::mock('Laratrust\Team');
+        $teamMock = m::mock('Laratrust\Models\LaratrustTeam')->makePartial();
+
+        Config::shouldReceive('get')->with('laratrust.user_models')->andReturn([]);
         $teamMock->name = $teamName;
         $teamMock->id = 1;