TypeScript: Updated compile target, addressed issues

[bookstack] / app / Permissions / JointPermissionBuilder.php

diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index c2922cdc9611481b1ba58a64d968f6e9d6dd18a8..56b22ad1604fc96fc18b2fe2265fc22f72a49c24 100644 (file)
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -29,7 +29,7 @@ class JointPermissionBuilder
     /**
      * Re-generate all entity permission from scratch.
      */
     /**
      * Re-generate all entity permission from scratch.
      */

-    public function rebuildForAll()
+    public function rebuildForAll(): void

     {
         JointPermission::query()->truncate();
 
     {
         JointPermission::query()->truncate();
 


@@ -51,7 +51,7 @@ class JointPermissionBuilder
     /**
      * Rebuild the entity jointPermissions for a particular entity.
      */
     /**
      * Rebuild the entity jointPermissions for a particular entity.
      */

-    public function rebuildForEntity(Entity $entity)
+    public function rebuildForEntity(Entity $entity): void

     {
         $entities = [$entity];
         if ($entity instanceof Book) {
     {
         $entities = [$entity];
         if ($entity instanceof Book) {


@@ -119,7 +119,7 @@ class JointPermissionBuilder
     /**
      * Build joint permissions for the given book and role combinations.
      */
     /**
      * Build joint permissions for the given book and role combinations.
      */

-    protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false)
+    protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false): void

     {
         $entities = clone $books;
 
     {
         $entities = clone $books;
 


@@ -143,7 +143,7 @@ class JointPermissionBuilder
     /**
      * Rebuild the entity jointPermissions for a collection of entities.
      */
     /**
      * Rebuild the entity jointPermissions for a collection of entities.
      */

-    protected function buildJointPermissionsForEntities(array $entities)
+    protected function buildJointPermissionsForEntities(array $entities): void

     {
         $roles = Role::query()->get()->values()->all();
         $this->deleteManyJointPermissionsForEntities($entities);
     {
         $roles = Role::query()->get()->values()->all();
         $this->deleteManyJointPermissionsForEntities($entities);


@@ -155,21 +155,19 @@ class JointPermissionBuilder
      *
      * @param Entity[] $entities
      */
      *
      * @param Entity[] $entities
      */

-    protected function deleteManyJointPermissionsForEntities(array $entities)
+    protected function deleteManyJointPermissionsForEntities(array $entities): void

     {
         $simpleEntities = $this->entitiesToSimpleEntities($entities);
         $idsByType = $this->entitiesToTypeIdMap($simpleEntities);
 
     {
         $simpleEntities = $this->entitiesToSimpleEntities($entities);
         $idsByType = $this->entitiesToTypeIdMap($simpleEntities);
 

-        DB::transaction(function () use ($idsByType) {
-            foreach ($idsByType as $type => $ids) {
-                foreach (array_chunk($ids, 1000) as $idChunk) {
-                    DB::table('joint_permissions')
-                        ->where('entity_type', '=', $type)
-                        ->whereIn('entity_id', $idChunk)
-                        ->delete();
-                }
+        foreach ($idsByType as $type => $ids) {
+            foreach (array_chunk($ids, 1000) as $idChunk) {
+                DB::table('joint_permissions')
+                    ->where('entity_type', '=', $type)
+                    ->whereIn('entity_id', $idChunk)
+                    ->delete();

             }
             }

-        });
+        }

     }
 
     /**
     }
 
     /**


@@ -195,7 +193,7 @@ class JointPermissionBuilder
      * @param Entity[] $originalEntities
      * @param Role[]   $roles
      */
      * @param Entity[] $originalEntities
      * @param Role[]   $roles
      */

-    protected function createManyJointPermissions(array $originalEntities, array $roles)
+    protected function createManyJointPermissions(array $originalEntities, array $roles): void

     {
         $entities = $this->entitiesToSimpleEntities($originalEntities);
         $jointPermissions = [];
     {
         $entities = $this->entitiesToSimpleEntities($originalEntities);
         $jointPermissions = [];


@@ -225,11 +223,9 @@ class JointPermissionBuilder
             }
         }
 
             }
         }
 

-        DB::transaction(function () use ($jointPermissions) {
-            foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
-                DB::table('joint_permissions')->insert($jointPermissionChunk);
-            }
-        });
+        foreach (array_chunk($jointPermissions, 1000) as $jointPermissionChunk) {
+            DB::table('joint_permissions')->insert($jointPermissionChunk);
+        }

     }
 
     /**
     }
 
     /**