Applied latest styleCI changes

This commit is contained in:
Dan Brown 2022-01-06 12:18:11 +00:00
parent cb0d674a71
commit 1a26b47782
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
10 changed files with 55 additions and 51 deletions

View File

@ -122,6 +122,7 @@ class BookContents
usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) { usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) {
$aScore = $itemA->type === 'page' ? 2 : 1; $aScore = $itemA->type === 'page' ? 2 : 1;
$bScore = $itemB->type === 'page' ? 2 : 1; $bScore = $itemB->type === 'page' ? 2 : 1;
return $aScore - $bScore; return $aScore - $bScore;
}); });
@ -265,6 +266,7 @@ class BookContents
/** /**
* Load models from the database into the given sort map. * Load models from the database into the given sort map.
*
* @return array<string, Entity> * @return array<string, Entity>
*/ */
protected function loadModelsFromSortMap(BookSortMap $sortMap): array protected function loadModelsFromSortMap(BookSortMap $sortMap): array

View File

@ -41,5 +41,4 @@ class BookSortMap
return $map; return $map;
} }
} }

View File

@ -4,7 +4,6 @@ namespace BookStack\Entities\Tools;
class BookSortMapItem class BookSortMapItem
{ {
/** /**
* @var int * @var int
*/ */
@ -30,7 +29,6 @@ class BookSortMapItem
*/ */
public $parentBookId; public $parentBookId;
public function __construct(int $id, int $sort, ?int $parentChapterId, string $type, int $parentBookId) public function __construct(int $id, int $sort, ?int $parentChapterId, string $type, int $parentBookId)
{ {
$this->id = $id; $this->id = $id;
@ -39,6 +37,4 @@ class BookSortMapItem
$this->type = $type; $this->type = $type;
$this->parentBookId = $parentBookId; $this->parentBookId = $parentBookId;
} }
} }

View File

@ -30,6 +30,7 @@ class RoleController extends Controller
$roles = $this->permissionsRepo->getAllRoles(); $roles = $this->permissionsRepo->getAllRoles();
$this->setPageTitle(trans('settings.roles')); $this->setPageTitle(trans('settings.roles'));
return view('settings.roles.index', ['roles' => $roles]); return view('settings.roles.index', ['roles' => $roles]);
} }
@ -51,6 +52,7 @@ class RoleController extends Controller
} }
$this->setPageTitle(trans('settings.role_create')); $this->setPageTitle(trans('settings.role_create'));
return view('settings.roles.create', ['role' => $role]); return view('settings.roles.create', ['role' => $role]);
} }
@ -85,6 +87,7 @@ class RoleController extends Controller
} }
$this->setPageTitle(trans('settings.role_edit')); $this->setPageTitle(trans('settings.role_edit'));
return view('settings.roles.edit', ['role' => $role]); return view('settings.roles.edit', ['role' => $role]);
} }
@ -120,6 +123,7 @@ class RoleController extends Controller
$roles->prepend($blankRole); $roles->prepend($blankRole);
$this->setPageTitle(trans('settings.role_delete')); $this->setPageTitle(trans('settings.role_delete'));
return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]); return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]);
} }

View File

@ -36,6 +36,7 @@ class WebhookController extends Controller
public function create() public function create()
{ {
$this->setPageTitle(trans('settings.webhooks_create')); $this->setPageTitle(trans('settings.webhooks_create'));
return view('settings.webhooks.create'); return view('settings.webhooks.create');
} }

View File

@ -3,7 +3,6 @@
namespace BookStack\Uploads; namespace BookStack\Uploads;
use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\ImageUploadException;
use BookStack\Util\WebSafeMimeSniffer;
use ErrorException; use ErrorException;
use Exception; use Exception;
use Illuminate\Contracts\Cache\Repository as Cache; use Illuminate\Contracts\Cache\Repository as Cache;
@ -240,6 +239,7 @@ class ImageService
} }
$initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT')); $initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT'));
return strpos($initialHeader, 'acTL') !== false; return strpos($initialHeader, 'acTL') !== false;
} }
@ -274,6 +274,7 @@ class ImageService
$storage = $this->getStorageDisk($image->type); $storage = $this->getStorageDisk($image->type);
if ($storage->exists($this->adjustPathForStorageDisk($thumbFilePath, $image->type))) { if ($storage->exists($this->adjustPathForStorageDisk($thumbFilePath, $image->type))) {
$this->cache->put($thumbCacheKey, $thumbFilePath, 60 * 60 * 72); $this->cache->put($thumbCacheKey, $thumbFilePath, 60 * 60 * 72);
return $this->getPublicUrl($thumbFilePath); return $this->getPublicUrl($thumbFilePath);
} }
@ -282,6 +283,7 @@ class ImageService
// Do not resize apng images where we're not cropping // Do not resize apng images where we're not cropping
if ($keepRatio && $this->isApngData($image, $imageData)) { if ($keepRatio && $this->isApngData($image, $imageData)) {
$this->cache->put($thumbCacheKey, $image->path, 60 * 60 * 72); $this->cache->put($thumbCacheKey, $image->path, 60 * 60 * 72);
return $this->getPublicUrl($image->path); return $this->getPublicUrl($image->path);
} }

View File

@ -84,7 +84,7 @@ class WebhookManagementTest extends TestCase
'endpoint' => 'https://example.com/updated-webhook', 'endpoint' => 'https://example.com/updated-webhook',
'events' => [ActivityType::PAGE_CREATE, ActivityType::PAGE_UPDATE], 'events' => [ActivityType::PAGE_CREATE, ActivityType::PAGE_UPDATE],
'active' => 'true', 'active' => 'true',
'timeout' => 5 'timeout' => 5,
]); ]);
$resp->assertRedirect('/settings/webhooks'); $resp->assertRedirect('/settings/webhooks');

View File

@ -431,7 +431,6 @@ class SortTest extends TestCase
]); ]);
} }
public function test_book_sort_item_returns_book_content() public function test_book_sort_item_returns_book_content()
{ {
$books = Book::all(); $books = Book::all();

View File

@ -170,6 +170,7 @@ class ThemeTest extends TestCase
$args = []; $args = [];
$callback = function (...$eventArgs) use (&$args) { $callback = function (...$eventArgs) use (&$args) {
$args = $eventArgs; $args = $eventArgs;
return ['test' => 'hello!']; return ['test' => 'hello!'];
}; };
Theme::listen(ThemeEvents::WEBHOOK_CALL_BEFORE, $callback); Theme::listen(ThemeEvents::WEBHOOK_CALL_BEFORE, $callback);