Fixed formatting via phpcbf

This commit is contained in:
Dan Brown 2018-09-21 18:48:47 +01:00
parent e60d11ee04
commit c47b578599
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
8 changed files with 35 additions and 30 deletions

View File

@ -1,6 +1,5 @@
<?php namespace BookStack; <?php namespace BookStack;
class Bookshelf extends Entity class Bookshelf extends Entity
{ {
protected $table = 'bookshelves'; protected $table = 'bookshelves';

View File

@ -72,7 +72,9 @@ class CleanupImages extends Command
protected function showDeletedImages($paths) protected function showDeletedImages($paths)
{ {
if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) return; if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) {
return;
}
if (count($paths) > 0) { if (count($paths) > 0) {
$this->line('Images to delete:'); $this->line('Images to delete:');
} }

View File

@ -240,5 +240,4 @@ class BookshelfController extends Controller
session()->flash('success', trans('entities.shelves_copy_permission_success', ['count' => $updateCount])); session()->flash('success', trans('entities.shelves_copy_permission_success', ['count' => $updateCount]));
return redirect($bookshelf->getUrl()); return redirect($bookshelf->getUrl());
} }
} }

View File

@ -19,5 +19,4 @@ class Image extends Ownable
{ {
return Images::getThumbnail($this, $width, $height, $keepRatio); return Images::getThumbnail($this, $width, $height, $keepRatio);
} }
} }

View File

@ -1297,7 +1297,9 @@ class EntityRepo
$updatedBookCount = 0; $updatedBookCount = 0;
foreach ($shelfBooks as $book) { foreach ($shelfBooks as $book) {
if (!userCan('restrictions-manage', $book)) continue; if (!userCan('restrictions-manage', $book)) {
continue;
}
$book->permissions()->delete(); $book->permissions()->delete();
$book->restricted = $bookshelf->restricted; $book->restricted = $bookshelf->restricted;
$book->permissions()->createMany($shelfPermissions); $book->permissions()->createMany($shelfPermissions);

View File

@ -366,5 +366,4 @@ class LdapService
$roleName = str_replace(' ', '-', trim(strtolower($role->display_name))); $roleName = str_replace(' ', '-', trim(strtolower($role->display_name)));
return in_array($roleName, $groupNames); return in_array($roleName, $groupNames);
} }
} }

View File

@ -48,10 +48,15 @@ class PermissionService
* @param Page $page * @param Page $page
*/ */
public function __construct( public function __construct(
JointPermission $jointPermission, EntityPermission $entityPermission, Role $role, Connection $db, JointPermission $jointPermission,
Bookshelf $bookshelf, Book $book, Chapter $chapter, Page $page EntityPermission $entityPermission,
) Role $role,
{ Connection $db,
Bookshelf $bookshelf,
Book $book,
Chapter $chapter,
Page $page
) {
$this->db = $db; $this->db = $db;
$this->jointPermission = $jointPermission; $this->jointPermission = $jointPermission;
$this->entityPermission = $entityPermission; $this->entityPermission = $entityPermission;