Closing v5.3.4

Author: Blair2004

app/Services/MenuService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use Illuminate\Support\Facades\Gate;
 use TorMorten\Eventy\Facades\Eventy as Hook;
 
 class MenuService
@@ -479,7 +480,15 @@ public function getMenus()
         $this->menus = Hook::filter( 'ns-dashboard-menus', $this->menus );
         $this->toggleActive();
 
-        return $this->menus;
+        return collect( $this->menus )->filter( function( $menu ) {
+            return ! isset( $menu[ 'permissions' ] ) || Gate::any( $menu[ 'permissions' ] );
+        })->map( function( $menu ) {
+            $menu[ 'childrens' ]    =   collect( $menu[ 'childrens' ] ?? [] )->filter( function( $submenu ) {
+                return ! isset( $submenu[ 'permissions' ] ) || Gate::any( $submenu[ 'permissions' ] );
+            })->toArray();
+
+            return $menu;
+        });
     }
 
     /**

config/sanctum.php

@@ -15,11 +15,11 @@
     |
     */
 
-    'stateful' => explode( ',', env( 'SANCTUM_STATEFUL_DOMAINS', sprintf(
+    'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
         '%s%s',
         'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
         Sanctum::currentApplicationUrlWithPort()
-    ) ) ),
+    ))),
 
     /*
     |--------------------------------------------------------------------------
@@ -61,7 +61,7 @@
     |
     */
 
-    'token_prefix' => env( 'SANCTUM_TOKEN_PREFIX', '' ),
+    'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php

@@ -11,23 +11,23 @@
      */
     public function up(): void
     {
-        Schema::create( 'personal_access_tokens', function ( Blueprint $table ) {
+        Schema::create('personal_access_tokens', function (Blueprint $table) {
             $table->id();
-            $table->morphs( 'tokenable' );
-            $table->string( 'name' );
-            $table->string( 'token', 64 )->unique();
-            $table->text( 'abilities' )->nullable();
-            $table->timestamp( 'last_used_at' )->nullable();
-            $table->timestamp( 'expires_at' )->nullable();
+            $table->morphs('tokenable');
+            $table->string('name');
+            $table->string('token', 64)->unique();
+            $table->text('abilities')->nullable();
+            $table->timestamp('last_used_at')->nullable();
+            $table->timestamp('expires_at')->nullable();
             $table->timestamps();
-        } );
+        });
     }
 
     /**
      * Reverse the migrations.
      */
     public function down(): void
     {
-        Schema::dropIfExists( 'personal_access_tokens' );
+        Schema::dropIfExists('personal_access_tokens');
     }
 };

resources/views/layout/dashboard.blade.php

@@ -118,17 +118,13 @@
                         </div>
                         <ul>
                             @foreach( $menus->getMenus() as $identifier => $menu )
-                                @if ( isset( $menu[ 'permissions' ] ) && Gate::allows( $menu[ 'permissions' ], 'some' ) || ! isset( $menu[ 'permissions' ] ) )
                                 <ns-menu identifier="{{ $identifier }}" toggled="{{ $menu[ 'toggled' ] ?? '' }}" label="{{ @$menu[ 'label' ] }}" icon="{{ @$menu[ 'icon' ] }}" href="{{ @$menu[ 'href' ] }}" notification="{{ isset( $menu[ 'notification' ] ) ? $menu[ 'notification' ] : 0 }}" id="menu-{{ $identifier }}">
                                     @if ( isset( $menu[ 'childrens' ] ) )
                                         @foreach( $menu[ 'childrens' ] as $identifier => $menu )
-                                            @if ( isset( $menu[ 'permissions' ] ) && Gate::allows( $menu[ 'permissions' ], 'some' ) || ! isset( $menu[ 'permissions' ] ) )
                                         <ns-submenu :active="{{ ( isset( $menu[ 'active' ] ) ? ( $menu[ 'active' ] ? 'true' : 'false' ) : 'false' ) }}" href="{{ $menu[ 'href' ] }}" id="submenu-{{ $identifier }}">{{ $menu[ 'label' ] }}</ns-submenu>
-                                            @endif
                                         @endforeach        
                                     @endif
                                 </ns-menu>
-                                @endif
                             @endforeach
                         </ul>
                     </div>

tests/Feature/UploadModuleTest.php

@@ -82,7 +82,8 @@ public function test_module_system()
          * Step 6: We'll reupload the module
          */
         $response = $this->withSession( $this->app[ 'session' ]->all() )
-            ->json( 'POST', '/api/modules', [
+            ->withHeader( 'Accept', 'text/html' )
+            ->post( '/api/modules', [
                 'module' => UploadedFile::fake()->createWithContent( 'module.zip', file_get_contents( $result[ 'path' ] ) ),
             ] );