complete wiring of laravel 8 update

httpoz · Mar 19, 2021 · 8e27e87 · 8e27e87
1 parent bbaa50c
commit 8e27e87
Show file tree

Hide file tree

Showing 13 changed files with 197 additions and 194 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/support": "~8.0",
-        "illuminate/cache": "~8.0"
+        "illuminate/cache": "^8.0",
+        "illuminate/support": "^8.0"
     },
     "require-dev": {
         "orchestra/database": "^6.0",
@@ -22,7 +22,8 @@
     },
     "autoload": {
         "psr-4": {
-            "HttpOz\\Roles\\": "src/"
+            "HttpOz\\Roles\\": "src/",
+            "HttpOz\\Roles\\Database\\Factories\\": "database/factories/"
         }
     },
     "autoload-dev": {
@@ -31,6 +32,8 @@
         }
     },
     "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
         "sort-packages": true
     },
     "extra": {

diff --git a/config/roles.php b/config/roles.php
@@ -34,7 +34,7 @@
     |
     | Here you can enable cache and change the period for which cache should
     | remember the roles. Time should be in seconds, refer to official docs
-    | https://laravel.com/docs/5.8/cache.
+    | https://laravel.com/docs/8.x/cache.
     */
 
     'cache' => [

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,36 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-    </php>
-    <logging>
-        <log type="coverage-html" target="./build/coverage"/>
-        <log type="coverage-clover" target="./build/logs/clover.xml"/>
-        <log type="testdox-html" target="./build/logstestdox.html"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <html outputDirectory="./build/coverage"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Feature">
+      <directory suffix="Test.php">./tests/Feature</directory>
+    </testsuite>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+  </php>
+  <logging>
+    <testdoxHtml outputFile="./build/logstestdox.html"/>
+  </logging>
 </phpunit>
diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -3,15 +3,17 @@
 namespace HttpOz\Roles\Models;
 
 
+use HttpOz\Roles\Database\Factories\RoleFactory;
 use HttpOz\Roles\Traits\Sluggable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 use HttpOz\Roles\Traits\RoleHasRelations;
 use HttpOz\Roles\Contracts\RoleHasRelations as RoleHasRelationsContract;
 
 class Role extends Model implements RoleHasRelationsContract {
 
-  use Sluggable, RoleHasRelations;
+  use Sluggable, RoleHasRelations, HasFactory;
 
   /**
    * The attributes that are mass assignable.
@@ -42,4 +44,9 @@ public static function findBySlug($slug) {
     return self::where('slug', $slug)->first();
   }
 
+  protected static function newFactory()
+  {
+      return new RoleFactory();
+  }
+
 }
diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php
@@ -16,21 +16,14 @@ class RolesServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->publishes([
-            __DIR__ . '/../config/roles.php' => config_path('roles.php')
-        ], 'config');
-
-        $stub      = __DIR__ . '/../database/migrations/';
-        $target    = database_path('migrations').'/';
-
-        $this->publishes([
-            $stub.'create_roles_table.php'     => $target . '2016_09_04_000000_create_roles_table.php',
-            $stub.'create_role_user_table.php' => $target . '2016_09_04_100000_create_role_user_table.php'
-        ], 'migrations');
+        // Load migrations
+        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations/');
 
-        $this->publishes([
-            __DIR__.'/../resources/views' => base_path('resources/views/vendor'),
-        ], 'views');
+        // publish config file
+        $this->publishes([__DIR__ . '/../config/roles.php' => config_path('roles.php')], 'config');
+
+        // publish views
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'roles');
 
         $this->registerBladeExtensions();
     }

diff --git a/tests/Feature/CreateRoleTest.php b/tests/Feature/CreateRoleTest.php
@@ -14,7 +14,7 @@ class CreateRoleTest extends TestCase
    */
     public function testCanCreateRole()
     {
-        $adminRole = factory(Role::class)->create([
+        $adminRole = Role::factory()->create([
         'name'        => 'Admin',
         'slug'        => 'admin',
         'description' => 'Custodians of the system.',

diff --git a/tests/Feature/RoleMiddlewareTest.php b/tests/Feature/RoleMiddlewareTest.php
@@ -6,22 +6,19 @@
 use HttpOz\Roles\Tests\Stubs\User;
 use HttpOz\Roles\Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class RoleMiddlewareTest extends TestCase
 {
 
-    use DatabaseMigrations;
-
     /**
      * A basic test example.
      *
      * @return void
      */
     public function testForbiddenRoleRoute()
     {
-        $createdUser = factory(User::class)->create();
-        $createdRole = factory(Role::class)->create([
+        $createdUser = User::factory()->create();
+        $createdRole = Role::factory()->create([
           'name' => 'Admin',
           'slug' => 'admin',
         ]);
@@ -37,9 +34,5 @@ public function testForbiddenRoleRoute()
 
         $this->assertEquals($createdRole->id, $foundRole->id);
         $this->assertEquals($createdUser->name, $foundUser->name);
-
-        /*$this->get('/admin/users')
-          ->assertStatus(200)
-          ->assertSee('I am an admin.');*/
     }
 }
diff --git a/tests/Feature/UserRoleTest.php b/tests/Feature/UserRoleTest.php
@@ -4,18 +4,15 @@
 
 use HttpOz\Roles\Tests\Stubs\User;
 use \HttpOz\Roles\Models\Role;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use HttpOz\Roles\Tests\TestCase;
 
 class UserRoleTest extends TestCase
 {
 
-    use DatabaseMigrations;
-
     public function testUserHasRoleOnAttach()
     {
-        $admin = factory(User::class)->create();
-        $role  = factory(Role::class)->create();
+        $admin = User::factory()->create();
+        $role  = Role::factory()->create();
 
         $adminRole = Role::findBySlug('admin');
         $user = User::find(1);

diff --git a/tests/Stubs/User.php b/tests/Stubs/User.php
@@ -2,6 +2,7 @@
 
 namespace HttpOz\Roles\Tests\Stubs;
 
+use HttpOz\Roles\Database\Factories\UserFactory;
 use \HttpOz\Roles\Traits\HasRole;
 use \HttpOz\Roles\Contracts\HasRole as HasRoleContract;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -21,4 +22,11 @@ public function getAuthIdentifiersName(): array
     {
         return ['email', 'username'];
     }
+
+
+
+    protected static function newFactory()
+    {
+        return new UserFactory();
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,7 +2,11 @@
 
 namespace HttpOz\Roles\Tests;
 
+use HttpOz\Roles\Models\Role;
+use HttpOz\Roles\RolesServiceProvider;
 use HttpOz\Roles\Tests\Stubs\User;
+use Illuminate\Foundation\Application;
+use Orchestra\Database\ConsoleServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra
@@ -15,21 +19,20 @@ public function setUp(): void
         parent::setUp();
         $this->loadLaravelMigrations(['--database' => 'testbench']);
         $this->setUpDatabase($this->app);
-
-        $this->withFactories(__DIR__ . '/../database/factories');
     }
 
-    protected function getPackageProviders($app)
+    protected function getPackageProviders($app): array
     {
         return [
-            \Orchestra\Database\ConsoleServiceProvider::class
+            RolesServiceProvider::class,
+            ConsoleServiceProvider::class
         ];
     }
 
     /**
      * Define environment setup.
      *
-     * @param  \Illuminate\Foundation\Application $app
+     * @param  Application  $app
      * @return void
      */
     public function getEnvironmentSetUp($app)
@@ -50,7 +53,7 @@ public function getEnvironmentSetUp($app)
                 'expiry' => 20160,
             ],
             'models' => [
-                'role' => \HttpOz\Roles\Models\Role::class
+                'role' => Role::class
             ],
             'pretend' => [
                 'enabled' => false,
@@ -64,7 +67,7 @@ public function getEnvironmentSetUp($app)
     /**
      * Set up the database.
      *
-     * @param \Illuminate\Foundation\Application $app
+     * @param  Application  $app
      */
     protected function setUpDatabase($app)
     {