Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-07-05 02:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-structured the app code to be feature based rather than code type based

Browse Source
This commit is contained in:
Dan Brown 2018-09-25 12:30:50 +01:00
parent 19751ed1cb
commit 919660678b
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
109 changed files with 684 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Activity.php → app/Actions/Activity.php
View File

@ -1,6 +1,9 @@
<?php
namespace BookStack;
namespace BookStack\Actions;
use BookStack\Auth\User;
use BookStack\Model;
/**
* @property string key

9
app/Services/ActivityService.php → app/Actions/ActivityService.php
View File

@ -1,7 +1,8 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Actions;
use BookStack\Activity;
use BookStack\Entity;
use BookStack\Actions\Activity;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Entities\Entity;
use Session;
class ActivityService
@ -12,7 +13,7 @@ class ActivityService
/**
* ActivityService constructor.
* @param Activity $activity
* @param \BookStack\Actions\Activity $activity
* @param PermissionService $permissionService
*/
public function __construct(Activity $activity, PermissionService $permissionService)

4
app/Comment.php → app/Actions/Comment.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Actions;
use BookStack\Ownable;
class Comment extends Ownable
{

22
app/Repos/CommentRepo.php → app/Actions/CommentRepo.php
View File

@ -1,7 +1,7 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Actions;
use BookStack\Comment;
use BookStack\Entity;
use BookStack\Actions\Comment;
use BookStack\Entities\Entity;
/**
* Class CommentRepo
@ -11,13 +11,13 @@ class CommentRepo
{
/**
* @var Comment $comment
* @var \BookStack\Actions\Comment $comment
*/
protected $comment;
/**
* CommentRepo constructor.
* @param Comment $comment
* @param \BookStack\Actions\Comment $comment
*/
public function __construct(Comment $comment)
{
@ -27,7 +27,7 @@ class CommentRepo
/**
* Get a comment by ID.
* @param $id
* @return Comment|\Illuminate\Database\Eloquent\Model
* @return \BookStack\Actions\Comment|\Illuminate\Database\Eloquent\Model
*/
public function getById($id)
{
@ -36,9 +36,9 @@ class CommentRepo
/**
* Create a new comment on an entity.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @param array $data
* @return Comment
* @return \BookStack\Actions\Comment
*/
public function create(Entity $entity, $data = [])
{
@ -53,7 +53,7 @@ class CommentRepo
/**
* Update an existing comment.
* @param Comment $comment
* @param \BookStack\Actions\Comment $comment
* @param array $input
* @return mixed
*/
@ -66,7 +66,7 @@ class CommentRepo
/**
* Delete a comment from the system.
* @param Comment $comment
* @param \BookStack\Actions\Comment $comment
* @return mixed
*/
public function delete($comment)
@ -76,7 +76,7 @@ class CommentRepo
/**
* Get the next local ID relative to the linked entity.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @return int
*/
protected function getNextLocalId(Entity $entity)

4
app/Tag.php → app/Actions/Tag.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Actions;
use BookStack\Model;
/**
* Class Attribute

17
app/Repos/TagRepo.php → app/Actions/TagRepo.php
View File

@ -1,8 +1,7 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Actions;
use BookStack\Tag;
use BookStack\Entity;
use BookStack\Services\PermissionService;
use BookStack\Entities\Entity;
use BookStack\Auth\Permissions\PermissionService;
/**
* Class TagRepo
@ -17,9 +16,9 @@ class TagRepo
/**
* TagRepo constructor.
* @param Tag $attr
* @param Entity $ent
* @param PermissionService $ps
* @param \BookStack\Actions\Tag $attr
* @param \BookStack\Entities\Entity $ent
* @param \BookStack\Auth\Permissions\PermissionService $ps
*/
public function __construct(Tag $attr, Entity $ent, PermissionService $ps)
{
@ -107,7 +106,7 @@ class TagRepo
/**
* Save an array of tags to an entity
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @param array $tags
* @return array|\Illuminate\Database\Eloquent\Collection
*/
@ -128,7 +127,7 @@ class TagRepo
/**
* Create a new Tag instance from user input.
* @param $input
* @return Tag
* @return \BookStack\Actions\Tag
*/
protected function newInstanceFromInput($input)
{

4
app/View.php → app/Actions/View.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Actions;
use BookStack\Model;
class View extends Model
{

17
app/Services/ViewService.php → app/Actions/ViewService.php
View File

@ -1,7 +1,7 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Actions;
use BookStack\Entity;
use BookStack\View;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Entities\Entity;
class ViewService
{
@ -10,8 +10,8 @@ class ViewService
/**
* ViewService constructor.
* @param View $view
* @param PermissionService $permissionService
* @param \BookStack\Actions\View $view
* @param \BookStack\Auth\Permissions\PermissionService $permissionService
*/
public function __construct(View $view, PermissionService $permissionService)
{
@ -50,12 +50,13 @@ class ViewService
* Get the entities with the most views.
* @param int $count
* @param int $page
* @param bool|false|array $filterModel
* @param Entity|false|array $filterModel
* @param string $action - used for permission checking
* @return
*/
public function getPopular($count = 10, $page = 0, $filterModel = false, $action = 'view')
{
// TODO - Standardise input filter
$skipCount = $count * $page;
$query = $this->permissionService->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type', $action)
->select('*', 'viewable_id', 'viewable_type', \DB::raw('SUM(views) as view_count'))
@ -65,7 +66,7 @@ class ViewService
if ($filterModel && is_array($filterModel)) {
$query->whereIn('viewable_type', $filterModel);
} else if ($filterModel) {
$query->where('viewable_type', '=', get_class($filterModel));
$query->where('viewable_type', '=', $filterModel->getMorphClass());
}
return $query->with('viewable')->skip($skipCount)->take($count)->get()->pluck('viewable');
@ -89,7 +90,7 @@ class ViewService
->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
if ($filterModel) {
$query = $query->where('viewable_type', '=', get_class($filterModel));
$query = $query->where('viewable_type', '=', $filterModel->getMorphClass());
}
$query = $query->where('user_id', '=', $user->id);

12
app/Services/EmailConfirmationService.php → app/Auth/Access/EmailConfirmationService.php
View File

@ -1,11 +1,11 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Auth\Access;
use BookStack\Notifications\ConfirmEmail;
use BookStack\Repos\UserRepo;
use BookStack\Auth\UserRepo;
use Carbon\Carbon;
use BookStack\Exceptions\ConfirmationEmailException;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\User;
use BookStack\Auth\User;
use Illuminate\Database\Connection as Database;
class EmailConfirmationService
@ -16,7 +16,7 @@ class EmailConfirmationService
/**
* EmailConfirmationService constructor.
* @param Database $db
* @param UserRepo $users
* @param \BookStack\Auth\UserRepo $users
*/
public function __construct(Database $db, UserRepo $users)
{
@ -27,7 +27,7 @@ class EmailConfirmationService
/**
* Create new confirmation for a user,
* Also removes any existing old ones.
* @param User $user
* @param \BookStack\Auth\User $user
* @throws ConfirmationEmailException
*/
public function sendConfirmation(User $user)
@ -88,7 +88,7 @@ class EmailConfirmationService
/**
* Delete all email confirmations that belong to a user.
* @param User $user
* @param \BookStack\Auth\User $user
* @return mixed
*/
public function deleteConfirmationsByUser(User $user)

2
app/Services/Ldap.php → app/Auth/Access/Ldap.php
View File

@ -1,4 +1,4 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Auth\Access;
/**
* Class Ldap

18
app/Services/LdapService.php → app/Auth/Access/LdapService.php
View File

@ -1,9 +1,11 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Auth\Access;
use BookStack\Auth\Access;
use BookStack\Exceptions\LdapException;
use BookStack\Repos\UserRepo;
use BookStack\Role;
use BookStack\User;
use BookStack\Auth\UserRepo;
use BookStack\Auth\Role;
use BookStack\Auth\User;
use BookStack\Auth\Access\Ldap;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder;
@ -24,9 +26,9 @@ class LdapService
/**
* LdapService constructor.
* @param Ldap $ldap
* @param UserRepo $userRepo
* @param \BookStack\Auth\UserRepo $userRepo
*/
public function __construct(Ldap $ldap, UserRepo $userRepo)
public function __construct(Access\Ldap $ldap, UserRepo $userRepo)
{
$this->ldap = $ldap;
$this->config = config('services.ldap');
@ -298,7 +300,7 @@ class LdapService
/**
* Sync the LDAP groups to the user roles for the current user
* @param \BookStack\User $user
* @param \BookStack\Auth\User $user
* @param string $username
* @throws LdapException
*/
@ -347,7 +349,7 @@ class LdapService
/**
* Check a role against an array of group names to see if it matches.
* Checked against role 'external_auth_id' if set otherwise the name of the role.
* @param Role $role
* @param \BookStack\Auth\Role $role
* @param array $groupNames
* @return bool
*/

8
app/Services/SocialAuthService.php → app/Auth/Access/SocialAuthService.php
View File

@ -1,11 +1,11 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Auth\Access;
use BookStack\Exceptions\SocialSignInAccountNotUsed;
use Laravel\Socialite\Contracts\Factory as Socialite;
use BookStack\Exceptions\SocialDriverNotConfigured;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\Repos\UserRepo;
use BookStack\SocialAccount;
use BookStack\Auth\UserRepo;
use BookStack\Auth\SocialAccount;
use Laravel\Socialite\Contracts\User as SocialUser;
class SocialAuthService
@ -19,7 +19,7 @@ class SocialAuthService
/**
* SocialAuthService constructor.
* @param UserRepo $userRepo
* @param \BookStack\Auth\UserRepo $userRepo
* @param Socialite $socialite
* @param SocialAccount $socialAccount
*/

4
app/EntityPermission.php → app/Auth/Permissions/EntityPermission.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth\Permissions;
use BookStack\Model;
class EntityPermission extends Model
{

6
app/JointPermission.php → app/Auth/Permissions/JointPermission.php
View File

@ -1,4 +1,8 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth\Permissions;
use BookStack\Entities\Entity;
use BookStack\Model;
use BookStack\Auth\Role;
class JointPermission extends Model
{

54
app/Services/PermissionService.php → app/Auth/Permissions/PermissionService.php
View File

@ -1,15 +1,16 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Auth\Permissions;
use BookStack\Book;
use BookStack\Bookshelf;
use BookStack\Chapter;
use BookStack\Entity;
use BookStack\EntityPermission;
use BookStack\JointPermission;
use BookStack\Auth\Permissions;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\Chapter;
use BookStack\Entities\Entity;
use BookStack\Auth\Permissions\EntityPermission;
use BookStack\Auth\Permissions\JointPermission;
use BookStack\Ownable;
use BookStack\Page;
use BookStack\Role;
use BookStack\User;
use BookStack\Entities\Page;
use BookStack\Auth\Role;
use BookStack\Auth\User;
use Illuminate\Database\Connection;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Query\Builder as QueryBuilder;
@ -44,12 +45,12 @@ class PermissionService
* @param Connection $db
* @param Bookshelf $bookshelf
* @param Book $book
* @param Chapter $chapter
* @param Page $page
* @param \BookStack\Entities\Chapter $chapter
* @param \BookStack\Entities\Page $page
*/
public function __construct(
JointPermission $jointPermission,
EntityPermission $entityPermission,
Permissions\EntityPermission $entityPermission,
Role $role,
Connection $db,
Bookshelf $bookshelf,
@ -78,7 +79,7 @@ class PermissionService
/**
* Prepare the local entity cache and ensure it's empty
* @param Entity[] $entities
* @param \BookStack\Entities\Entity[] $entities
*/
protected function readyEntityCache($entities = [])
{
@ -115,7 +116,7 @@ class PermissionService
/**
* Get a chapter via ID, Checks local cache
* @param $chapterId
* @return Book
* @return \BookStack\Entities\Book
*/
protected function getChapter($chapterId)
{
@ -234,7 +235,7 @@ class PermissionService
/**
* Rebuild the entity jointPermissions for a particular entity.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @throws \Throwable
*/
public function buildJointPermissionsForEntity(Entity $entity)
@ -329,7 +330,7 @@ class PermissionService
/**
* Delete all of the entity jointPermissions for a list of entities.
* @param Entity[] $entities
* @param \BookStack\Entities\Entity[] $entities
* @throws \Throwable
*/
protected function deleteManyJointPermissionsForEntities($entities)
@ -410,7 +411,7 @@ class PermissionService
/**
* Get the actions related to an entity.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @return array
*/
protected function getActions(Entity $entity)
@ -496,7 +497,7 @@ class PermissionService
/**
* Create an array of data with the information of an entity jointPermissions.
* Used to build data for bulk insertion.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @param Role $role
* @param $action
* @param $permissionAll
@ -554,7 +555,7 @@ class PermissionService
/**
* Check if an entity has restrictions set on itself or its
* parent tree.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @param $action
* @return bool|mixed
*/
@ -635,7 +636,7 @@ class PermissionService
/**
* Add restrictions for a generic entity
* @param string $entityType
* @param Builder|Entity $query
* @param Builder|\BookStack\Entities\Entity $query
* @param string $action
* @return Builder
*/
@ -703,12 +704,13 @@ class PermissionService
$this->currentAction = 'view';
$tableDetails = ['tableName' => $tableName, 'entityIdColumn' => $entityIdColumn];
$q = $query->where(function ($query) use ($tableDetails) {
$query->where(function ($query) use (&$tableDetails) {
$query->whereExists(function ($permissionQuery) use (&$tableDetails) {
$pageMorphClass = $this->page->getMorphClass();
$q = $query->where(function ($query) use ($tableDetails, $pageMorphClass) {
$query->where(function ($query) use (&$tableDetails, $pageMorphClass) {
$query->whereExists(function ($permissionQuery) use (&$tableDetails, $pageMorphClass) {
$permissionQuery->select('id')->from('joint_permissions')
->whereRaw('joint_permissions.entity_id=' . $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
->where('entity_type', '=', 'Bookstack\\Page')
->where('entity_type', '=', $pageMorphClass)
->where('action', '=', $this->currentAction)
->whereIn('role_id', $this->getRoles())
->where(function ($query) {
@ -726,7 +728,7 @@ class PermissionService
/**
* Get the current user
* @return User
* @return \BookStack\Auth\User
*/
private function currentUser()
{

13
app/Repos/PermissionsRepo.php → app/Auth/Permissions/PermissionsRepo.php
View File

@ -1,9 +1,10 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Auth\Permissions;
use BookStack\Auth\Permissions;
use BookStack\Exceptions\PermissionsException;
use BookStack\RolePermission;
use BookStack\Role;
use BookStack\Services\PermissionService;
use BookStack\Auth\Permissions\RolePermission;
use BookStack\Auth\Role;
use BookStack\Auth\Permissions\PermissionService;
use Setting;
class PermissionsRepo
@ -19,9 +20,9 @@ class PermissionsRepo
* PermissionsRepo constructor.
* @param RolePermission $permission
* @param Role $role
* @param PermissionService $permissionService
* @param \BookStack\Auth\Permissions\PermissionService $permissionService
*/
public function __construct(RolePermission $permission, Role $role, PermissionService $permissionService)
public function __construct(RolePermission $permission, Role $role, Permissions\PermissionService $permissionService)
{
$this->permission = $permission;
$this->role = $role;

5
app/RolePermission.php → app/Auth/Permissions/RolePermission.php
View File

@ -1,4 +1,7 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth\Permissions;
use BookStack\Auth\Role;
use BookStack\Model;
class RolePermission extends Model
{

16
app/Role.php → app/Auth/Role.php
View File

@ -1,4 +1,8 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth;
use BookStack\Auth\Permissions\JointPermission;
use BookStack\Model;
use BookStack\Auth\Permissions\RolePermission;
class Role extends Model
{
@ -27,7 +31,7 @@ class Role extends Model
*/
public function permissions()
{
return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id');
return $this->belongsToMany(Permissions\RolePermission::class, 'permission_role', 'role_id', 'permission_id');
}
/**
@ -48,18 +52,18 @@ class Role extends Model
/**
* Add a permission to this role.
* @param RolePermission $permission
* @param \BookStack\Auth\Permissions\RolePermission $permission
*/
public function attachPermission(RolePermission $permission)
public function attachPermission(Permissions\RolePermission $permission)
{
$this->permissions()->attach($permission->id);
}
/**
* Detach a single permission from this role.
* @param RolePermission $permission
* @param \BookStack\Auth\Permissions\RolePermission $permission
*/
public function detachPermission(RolePermission $permission)
public function detachPermission(Permissions\RolePermission $permission)
{
$this->permissions()->detach($permission->id);
}

5
app/SocialAccount.php → app/Auth/SocialAccount.php
View File

@ -1,4 +1,7 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth;
use BookStack\Auth\User;
use BookStack\Model;
class SocialAccount extends Model
{

6
app/User.php → app/Auth/User.php
View File

@ -1,6 +1,10 @@
<?php namespace BookStack;
<?php namespace BookStack\Auth;
use BookStack\Uploads\Image;
use BookStack\Model;
use BookStack\Notifications\ResetPassword;
use BookStack\Auth\Role;
use BookStack\Auth\SocialAccount;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;

23
app/Repos/UserRepo.php → app/Auth/UserRepo.php
View File

@ -1,10 +1,11 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Auth;
use Activity;
use BookStack\Entities\EntityRepo;
use BookStack\Exceptions\NotFoundException;
use BookStack\Image;
use BookStack\Role;
use BookStack\User;
use BookStack\Uploads\Image;
use BookStack\Auth\Role;
use BookStack\Auth\User;
use Exception;
use Images;
@ -80,7 +81,7 @@ class UserRepo
* Creates a new user and attaches a role to them.
* @param array $data
* @param boolean $verifyEmail
* @return User
* @return \BookStack\Auth\User
*/
public function registerNew(array $data, $verifyEmail = false)
{
@ -122,7 +123,7 @@ class UserRepo
/**
* Checks if the give user is the only admin.
* @param User $user
* @param \BookStack\Auth\User $user
* @return bool
*/
public function isOnlyAdmin(User $user)
@ -142,7 +143,7 @@ class UserRepo
* Create a new basic instance of user.
* @param array $data
* @param boolean $verifyEmail
* @return User
* @return \BookStack\Auth\User
*/
public function create(array $data, $verifyEmail = false)
{
@ -157,7 +158,7 @@ class UserRepo
/**
* Remove the given user from storage, Delete all related content.
* @param User $user
* @param \BookStack\Auth\User $user
* @throws Exception
*/
public function destroy(User $user)
@ -174,7 +175,7 @@ class UserRepo
/**
* Get the latest activity for a user.
* @param User $user
* @param \BookStack\Auth\User $user
* @param int $count
* @param int $page
* @return array
@ -186,7 +187,7 @@ class UserRepo
/**
* Get the recently created content for this given user.
* @param User $user
* @param \BookStack\Auth\User $user
* @param int $count
* @return mixed
*/
@ -207,7 +208,7 @@ class UserRepo
/**
* Get asset created counts for the give user.
* @param User $user
* @param \BookStack\Auth\User $user
* @return array
*/
public function getAssetCounts(User $user)

4
app/Console/Commands/CleanupImages.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\Services\ImageService;
use BookStack\Uploads\ImageService;
use Illuminate\Console\Command;
use Symfony\Component\Console\Output\OutputInterface;
@ -30,7 +30,7 @@ class CleanupImages extends Command
/**
* Create a new command instance.
* @param ImageService $imageService
* @param \BookStack\Uploads\ImageService $imageService
*/
public function __construct(ImageService $imageService)
{

2
app/Console/Commands/ClearActivity.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\Activity;
use BookStack\Actions\Activity;
use Illuminate\Console\Command;
class ClearActivity extends Command

2
app/Console/Commands/ClearRevisions.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\PageRevision;
use BookStack\Entities\PageRevision;
use Illuminate\Console\Command;
class ClearRevisions extends Command

2
app/Console/Commands/CreateAdmin.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\Repos\UserRepo;
use BookStack\Auth\UserRepo;
use Illuminate\Console\Command;
class CreateAdmin extends Command

4
app/Console/Commands/DeleteUsers.php
View File

@ -2,8 +2,8 @@
namespace BookStack\Console\Commands;
use BookStack\User;
use BookStack\Repos\UserRepo;
use BookStack\Auth\User;
use BookStack\Auth\UserRepo;
use Illuminate\Console\Command;
class DeleteUsers extends Command

4
app/Console/Commands/RegeneratePermissions.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\Services\PermissionService;
use BookStack\Auth\Permissions\PermissionService;
use Illuminate\Console\Command;
class RegeneratePermissions extends Command
@ -31,7 +31,7 @@ class RegeneratePermissions extends Command
/**
* Create a new command instance.
*
* @param PermissionService $permissionService
* @param \BookStack\Auth\\BookStack\Auth\Permissions\PermissionService $permissionService
*/
public function __construct(PermissionService $permissionService)
{

4
app/Console/Commands/RegenerateSearch.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Console\Commands;
use BookStack\Services\SearchService;
use BookStack\Entities\SearchService;
use Illuminate\Console\Command;
class RegenerateSearch extends Command
@ -26,7 +26,7 @@ class RegenerateSearch extends Command
/**
* Create a new command instance.
*
* @param SearchService $searchService
* @param \BookStack\Entities\SearchService $searchService
*/
public function __construct(SearchService $searchService)
{

14
app/Book.php → app/Entities/Book.php
View File

@ -1,4 +1,7 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Uploads\Image;
use BookStack\Entities\Page;
class Book extends Entity
{
@ -6,6 +9,15 @@ class Book extends Entity
protected $fillable = ['name', 'description', 'image_id'];
/**
* Get the morph class for this model.
* @return string
*/
public function getMorphClass()
{
return 'BookStack\\Book';
}
/**
* Get the url for this book.
* @param string|bool $path

13
app/Bookshelf.php → app/Entities/Bookshelf.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Uploads\Image;
class Bookshelf extends Entity
{
@ -8,6 +10,15 @@ class Bookshelf extends Entity
protected $fillable = ['name', 'description', 'image_id'];
/**
* Get the morph class for this model.
* @return string
*/
public function getMorphClass()
{
return 'BookStack\\Bookshelf';
}
/**
* Get the books in this shelf.
* Should not be used directly since does not take into account permissions.

15
app/Chapter.php → app/Entities/Chapter.php
View File

@ -1,4 +1,8 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Entities\Book;
use BookStack\Entities\Entity;
use BookStack\Entities\Page;
class Chapter extends Entity
{
@ -6,6 +10,15 @@ class Chapter extends Entity
protected $fillable = ['name', 'description', 'priority', 'book_id'];
/**
* Get the morph class for this model.
* @return string
*/
public function getMorphClass()
{
return 'BookStack\\Chapter';
}
/**
* Get the book this chapter is within.
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo

22
app/Entity.php → app/Entities/Entity.php
View File

@ -1,5 +1,12 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Actions\Activity;
use BookStack\Actions\Comment;
use BookStack\Auth\Permissions\EntityPermission;
use BookStack\Auth\Permissions\JointPermission;
use BookStack\Ownable;
use BookStack\Actions\Tag;
use BookStack\Actions\View;
use Illuminate\Database\Eloquent\Relations\MorphMany;
class Entity extends Ownable
@ -15,6 +22,17 @@ class Entity extends Ownable
*/
public $searchFactor = 1.0;
/**
* Get the morph class for this model.
* Set here since, due to folder changes, the namespace used
* in the database no longer matches the class namespace.
* @return string
*/
public function getMorphClass()
{
return 'BookStack\\Entity';
}
/**
* Compares this entity to another given entity.
* Matches by comparing class and id.
@ -158,7 +176,7 @@ class Entity extends Ownable
return null;
}
return app('BookStack\\' . $className);
return app('BookStack\\Entities\\' . $className);
}
/**

7
app/Entities/EntityProvider.php Normal file
View File

@ -0,0 +1,7 @@
<?php namespace BookStack\Entities;
class EntityProvider
{
// TODO -
}

111
app/Repos/EntityRepo.php → app/Entities/EntityRepo.php
View File

@ -1,17 +1,18 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Entities;
use BookStack\Book;
use BookStack\Bookshelf;
use BookStack\Chapter;
use BookStack\Entity;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\Chapter;
use BookStack\Entities\Entity;
use BookStack\Exceptions\NotFoundException;
use BookStack\Exceptions\NotifyException;
use BookStack\Page;
use BookStack\PageRevision;
use BookStack\Services\AttachmentService;
use BookStack\Services\PermissionService;
use BookStack\Services\SearchService;
use BookStack\Services\ViewService;
use BookStack\Entities\Page;
use BookStack\Entities\PageRevision;
use BookStack\Actions\TagRepo;
use BookStack\Uploads\AttachmentService;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Entities\SearchService;
use BookStack\Actions\ViewService;
use Carbon\Carbon;
use DOMDocument;
use DOMXPath;
@ -20,12 +21,12 @@ use Illuminate\Support\Collection;
class EntityRepo
{
/**
* @var Bookshelf
* @var \BookStack\Entities\Bookshelf
*/
public $bookshelf;
/**
* @var Book $book
* @var \BookStack\Entities\Book $book
*/
public $book;
@ -61,7 +62,7 @@ class EntityRepo
protected $viewService;
/**
* @var TagRepo
* @var \BookStack\Actions\TagRepo
*/
protected $tagRepo;
@ -72,14 +73,14 @@ class EntityRepo
/**
* EntityRepo constructor.
* @param Bookshelf $bookshelf
* @param Book $book
* @param \BookStack\Entities\Bookshelf $bookshelf
* @param \BookStack\Entities\Book $book
* @param Chapter $chapter
* @param Page $page
* @param PageRevision $pageRevision
* @param \BookStack\Entities\Page $page
* @param \BookStack\Entities\PageRevision $pageRevision
* @param ViewService $viewService
* @param PermissionService $permissionService
* @param TagRepo $tagRepo
* @param \BookStack\Actions\TagRepo $tagRepo
* @param SearchService $searchService
*/
public function __construct(
@ -113,7 +114,7 @@ class EntityRepo
/**
* Get an entity instance via type.
* @param $type
* @return Entity
* @return \BookStack\Entities\Entity
*/
protected function getEntity($type)
{
@ -152,7 +153,7 @@ class EntityRepo
* @param integer $id
* @param bool $allowDrafts
* @param bool $ignorePermissions
* @return Entity
* @return \BookStack\Entities\Entity
*/
public function getById($type, $id, $allowDrafts = false, $ignorePermissions = false)
{
@ -168,7 +169,7 @@ class EntityRepo
* @param string $type
* @param string $slug
* @param string|bool $bookSlug
* @return Entity
* @return \BookStack\Entities\Entity
* @throws NotFoundException
*/
public function getBySlug($type, $slug, $bookSlug = false)
@ -343,7 +344,7 @@ class EntityRepo
/**
* Get the child items for a chapter sorted by priority but
* with draft items floated to the top.
* @param Bookshelf $bookshelf
* @param \BookStack\Entities\Bookshelf $bookshelf
* @return \Illuminate\Database\Eloquent\Collection|static[]
*/
public function getBookshelfChildren(Bookshelf $bookshelf)
@ -355,7 +356,7 @@ class EntityRepo
* Get all child objects of a book.
* Returns a sorted collection of Pages and Chapters.
* Loads the book slug onto child elements to prevent access database access for getting the slug.
* @param Book $book
* @param \BookStack\Entities\Book $book
* @param bool $filterDrafts
* @param bool $renderPages
* @return mixed
@ -368,13 +369,13 @@ class EntityRepo
$tree = [];
foreach ($q as $index => $rawEntity) {
if ($rawEntity->entity_type === 'BookStack\\Page') {
if ($rawEntity->entity_type === $this->page->getMorphClass()) {
$entities[$index] = $this->page->newFromBuilder($rawEntity);
if ($renderPages) {
$entities[$index]->html = $rawEntity->html;
$entities[$index]->html = $this->renderPage($entities[$index]);
};
} else if ($rawEntity->entity_type === 'BookStack\\Chapter') {
} else if ($rawEntity->entity_type === $this->chapter->getMorphClass()) {
$entities[$index] = $this->chapter->newFromBuilder($rawEntity);
$key = $entities[$index]->entity_type . ':' . $entities[$index]->id;
$parents[$key] = $entities[$index];
@ -390,7 +391,7 @@ class EntityRepo
if ($entity->chapter_id === 0 || $entity->chapter_id === '0') {
continue;
}
$parentKey = 'BookStack\\Chapter:' . $entity->chapter_id;
$parentKey = $this->chapter->getMorphClass() . ':' . $entity->chapter_id;
if (!isset($parents[$parentKey])) {
$tree[] = $entity;
continue;
@ -405,7 +406,7 @@ class EntityRepo
/**
* Get the child items for a chapter sorted by priority but
* with draft items floated to the top.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @return \Illuminate\Database\Eloquent\Collection|static[]
*/
public function getChapterChildren(Chapter $chapter)
@ -417,7 +418,7 @@ class EntityRepo
/**
* Get the next sequential priority for a new child element in the given book.
* @param Book $book
* @param \BookStack\Entities\Book $book
* @return int
*/
public function getNewBookPriority(Book $book)
@ -428,7 +429,7 @@ class EntityRepo
/**
* Get a new priority for a new page to be added to the given chapter.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @return int
*/
public function getNewChapterPriority(Chapter $chapter)
@ -477,7 +478,7 @@ class EntityRepo
/**
* Updates entity restrictions from a request
* @param $request
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
*/
public function updateEntityPermissionsFromRequest($request, Entity $entity)
{
@ -507,7 +508,7 @@ class EntityRepo
* @param string $type
* @param array $input
* @param bool|Book $book
* @return Entity
* @return \BookStack\Entities\Entity
*/
public function createFromInput($type, $input = [], $book = false)
{
@ -531,9 +532,9 @@ class EntityRepo
* Update entity details from request input.
* Used for books and chapters
* @param string $type
* @param Entity $entityModel
* @param \BookStack\Entities\Entity $entityModel
* @param array $input
* @return Entity
* @return \BookStack\Entities\Entity
*/
public function updateFromInput($type, Entity $entityModel, $input = [])
{
@ -556,7 +557,7 @@ class EntityRepo
/**
* Sync the books assigned to a shelf from a comma-separated list
* of book IDs.
* @param Bookshelf $shelf
* @param \BookStack\Entities\Bookshelf $shelf
* @param string $books
*/
public function updateShelfBooks(Bookshelf $shelf, string $books)
@ -581,7 +582,7 @@ class EntityRepo
* @param integer $newBookId
* @param Entity $entity
* @param bool $rebuildPermissions
* @return Entity
* @return \BookStack\Entities\Entity
*/
public function changeBook($type, $newBookId, Entity $entity, $rebuildPermissions = false)
{
@ -639,7 +640,7 @@ class EntityRepo
* Get a new draft page instance.
* @param Book $book
* @param Chapter|bool $chapter
* @return Page
* @return \BookStack\Entities\Page
*/
public function getDraftPage(Book $book, $chapter = false)
{
@ -689,10 +690,10 @@ class EntityRepo
/**
* Create a copy of a page in a new location with a new name.
* @param Page $page
* @param Entity $newParent
* @param \BookStack\Entities\Page $page
* @param \BookStack\Entities\Entity $newParent
* @param string $newName
* @return Page
* @return \BookStack\Entities\Page
*/
public function copyPage(Page $page, Entity $newParent, $newName = '')
{
@ -728,7 +729,7 @@ class EntityRepo
* Saves a page revision into the system.
* @param Page $page
* @param null|string $summary
* @return PageRevision
* @return \BookStack\Entities\PageRevision
*/
public function savePageRevision(Page $page, $summary = null)
{
@ -902,7 +903,7 @@ class EntityRepo
/**
* Get the plain text version of a page's content.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @return string
*/
public function pageToPlainText(Page $page)
@ -971,10 +972,10 @@ class EntityRepo
/**
* Updates a page with any fillable data and saves it into the database.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @param int $book_id
* @param array $input
* @return Page
* @return \BookStack\Entities\Page
*/
public function updatePage(Page $page, $book_id, $input)
{
@ -1019,7 +1020,7 @@ class EntityRepo
/**
* The base query for getting user update drafts.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @param $userId
* @return mixed
*/
@ -1033,7 +1034,7 @@ class EntityRepo
/**
* Checks whether a user has a draft version of a particular page or not.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @param $userId
* @return bool
*/
@ -1072,7 +1073,7 @@ class EntityRepo
* Checks for edits since last page updated.
* Passing in a minuted range will check for edits
* within the last x minutes.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @param null $minRange
* @return bool
*/
@ -1108,7 +1109,7 @@ class EntityRepo
* @param Page $page
* @param Book $book
* @param int $revisionId
* @return Page
* @return \BookStack\Entities\Page
*/
public function restorePageRevision(Page $page, Book $book, $revisionId)
{
@ -1184,8 +1185,8 @@ class EntityRepo
/**
* Change the page's parent to the given entity.
* @param Page $page
* @param Entity $parent
* @param \BookStack\Entities\Page $page
* @param \BookStack\Entities\Entity $parent
*/
public function changePageParent(Page $page, Entity $parent)
{
@ -1201,7 +1202,7 @@ class EntityRepo
/**
* Destroy a bookshelf instance
* @param Bookshelf $shelf
* @param \BookStack\Entities\Bookshelf $shelf
* @throws \Throwable
*/
public function destroyBookshelf(Bookshelf $shelf)
@ -1212,7 +1213,7 @@ class EntityRepo
/**
* Destroy the provided book and all its child entities.
* @param Book $book
* @param \BookStack\Entities\Book $book
* @throws NotifyException
* @throws \Throwable
*/
@ -1230,7 +1231,7 @@ class EntityRepo
/**
* Destroy a chapter and its relations.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @throws \Throwable
*/
public function destroyChapter(Chapter $chapter)
@ -1272,7 +1273,7 @@ class EntityRepo
/**
* Destroy or handle the common relations connected to an entity.
* @param Entity $entity
* @param \BookStack\Entities\Entity $entity
* @throws \Throwable
*/
protected function destroyEntityCommonRelations(Entity $entity)
@ -1289,7 +1290,7 @@ class EntityRepo
/**
* Copy the permissions of a bookshelf to all child books.
* Returns the number of books that had permissions updated.
* @param Bookshelf $bookshelf
* @param \BookStack\Entities\Bookshelf $bookshelf
* @return int
* @throws \Throwable
*/

21
app/Services/ExportService.php → app/Entities/ExportService.php
View File

@ -1,9 +1,10 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Entities;
use BookStack\Book;
use BookStack\Chapter;
use BookStack\Page;
use BookStack\Repos\EntityRepo;
use BookStack\Entities\Book;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
use BookStack\Entities\EntityRepo;
use BookStack\Uploads\ImageService;
class ExportService
{
@ -24,7 +25,7 @@ class ExportService
/**
* Convert a page to a self-contained HTML file.
* Includes required CSS & image content. Images are base64 encoded into the HTML.
* @param Page $page
* @param \BookStack\Entities\Page $page
* @return mixed|string
* @throws \Throwable
*/
@ -39,7 +40,7 @@ class ExportService
/**
* Convert a chapter to a self-contained HTML file.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @return mixed|string
* @throws \Throwable
*/
@ -89,7 +90,7 @@ class ExportService
/**
* Convert a chapter to a PDF file.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @return mixed|string
* @throws \Throwable
*/
@ -108,7 +109,7 @@ class ExportService
/**
* Convert a book to a PDF file
* @param Book $book
* @param \BookStack\Entities\Book $book
* @return string
* @throws \Throwable
*/
@ -208,7 +209,7 @@ class ExportService
/**
* Convert a chapter into a plain text string.
* @param Chapter $chapter
* @param \BookStack\Entities\Chapter $chapter
* @return string
*/
public function chapterToPlainText(Chapter $chapter)

19
app/Page.php → app/Entities/Page.php
View File

@ -1,4 +1,10 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Uploads\Attachment;
use BookStack\Entities\Book;
use BookStack\Entities\Chapter;
use BookStack\Entities\Entity;
use BookStack\Entities\PageRevision;
class Page extends Entity
{
@ -8,6 +14,15 @@ class Page extends Entity
public $textField = 'text';
/**
* Get the morph class for this model.
* @return string
*/
public function getMorphClass()
{
return 'BookStack\\Page';
}
/**
* Converts this page into a simplified array.
* @return mixed
@ -115,7 +130,7 @@ class Page extends Entity
/**
* Get the current revision for the page if existing
* @return \BookStack\PageRevision|null
* @return \BookStack\Entities\PageRevision|null
*/
public function getCurrentRevision()
{

6
app/PageRevision.php → app/Entities/PageRevision.php
View File

@ -1,4 +1,8 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Entities\Page;
use BookStack\Model;
use BookStack\Auth\User;
class PageRevision extends Model
{

21
app/Services/SearchService.php → app/Entities/SearchService.php
View File

@ -1,11 +1,12 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Entities;
use BookStack\Book;
use BookStack\Bookshelf;
use BookStack\Chapter;
use BookStack\Entity;
use BookStack\Page;
use BookStack\SearchTerm;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\Chapter;
use BookStack\Entities\Entity;
use BookStack\Entities\Page;
use BookStack\Entities\SearchTerm;
use BookStack\Auth\Permissions\PermissionService;
use Illuminate\Database\Connection;
use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\JoinClause;
@ -36,8 +37,8 @@ class SearchService
* SearchService constructor.
* @param SearchTerm $searchTerm
* @param Bookshelf $bookshelf
* @param Book $book
* @param Chapter $chapter
* @param \BookStack\Entities\Book $book
* @param \BookStack\Entities\Chapter $chapter
* @param Page $page
* @param Connection $db
* @param PermissionService $permissionService
@ -352,7 +353,7 @@ class SearchService
/**
* Index multiple Entities at once
* @param Entity[] $entities
* @param \BookStack\Entities\Entity[] $entities
*/
protected function indexEntities($entities)
{

4
app/SearchTerm.php → app/Entities/SearchTerm.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Entities;
use BookStack\Model;
class SearchTerm extends Model
{

2
app/Services/Facades/Activity.php → app/Facades/Activity.php
View File

@ -1,4 +1,4 @@
<?php namespace BookStack\Services\Facades;
<?php namespace BookStack\Facades;
use Illuminate\Support\Facades\Facade;

2
app/Services/Facades/Images.php → app/Facades/Images.php
View File

@ -1,4 +1,4 @@
<?php namespace BookStack\Services\Facades;
<?php namespace BookStack\Facades;
use Illuminate\Support\Facades\Facade;

2
app/Services/Facades/Setting.php → app/Facades/Setting.php
View File

@ -1,4 +1,4 @@
<?php namespace BookStack\Services\Facades;
<?php namespace BookStack\Facades;
use Illuminate\Support\Facades\Facade;

2
app/Services/Facades/Views.php → app/Facades/Views.php
View File

@ -1,4 +1,4 @@
<?php namespace BookStack\Services\Facades;
<?php namespace BookStack\Facades;
use Illuminate\Support\Facades\Facade;

8
app/Http/Controllers/AttachmentController.php
View File

@ -1,10 +1,10 @@
<?php namespace BookStack\Http\Controllers;
use BookStack\Exceptions\FileUploadException;
use BookStack\Attachment;
use BookStack\Uploads\Attachment;
use BookStack\Exceptions\NotFoundException;
use BookStack\Repos\EntityRepo;
use BookStack\Services\AttachmentService;
use BookStack\Entities\EntityRepo;
use BookStack\Uploads\AttachmentService;
use Illuminate\Http\Request;
class AttachmentController extends Controller
@ -15,7 +15,7 @@ class AttachmentController extends Controller
/**
* AttachmentController constructor.
* @param AttachmentService $attachmentService
* @param \BookStack\Uploads\AttachmentService $attachmentService
* @param Attachment $attachment
* @param EntityRepo $entityRepo
*/

10
app/Http/Controllers/Auth/LoginController.php
View File

@ -4,9 +4,9 @@ namespace BookStack\Http\Controllers\Auth;
use BookStack\Exceptions\AuthException;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\UserRepo;
use BookStack\Services\LdapService;
use BookStack\Services\SocialAuthService;
use BookStack\Auth\UserRepo;
use BookStack\Auth\Access\LdapService;
use BookStack\Auth\Access\SocialAuthService;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
@ -43,9 +43,9 @@ class LoginController extends Controller
/**
* Create a new controller instance.
*
* @param SocialAuthService $socialAuthService
* @param \BookStack\Auth\\BookStack\Auth\Access\SocialAuthService $socialAuthService
* @param LdapService $ldapService
* @param UserRepo $userRepo
* @param \BookStack\Auth\UserRepo $userRepo
*/
public function __construct(SocialAuthService $socialAuthService, LdapService $ldapService, UserRepo $userRepo)
{

20
app/Http/Controllers/Auth/RegisterController.php
View File

@ -5,11 +5,11 @@ namespace BookStack\Http\Controllers\Auth;
use BookStack\Exceptions\SocialSignInAccountNotUsed;
use BookStack\Exceptions\SocialSignInException;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\Repos\UserRepo;
use BookStack\Services\EmailConfirmationService;
use BookStack\Services\SocialAuthService;
use BookStack\SocialAccount;
use BookStack\User;
use BookStack\Auth\UserRepo;
use BookStack\Auth\Access\EmailConfirmationService;
use BookStack\Auth\Access\SocialAuthService;
use BookStack\Auth\SocialAccount;
use BookStack\Auth\User;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@ -48,11 +48,11 @@ class RegisterController extends Controller
/**
* Create a new controller instance.
*
* @param SocialAuthService $socialAuthService
* @param EmailConfirmationService $emailConfirmationService
* @param UserRepo $userRepo
* @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
* @param \BookStack\Auth\EmailConfirmationService $emailConfirmationService
* @param \BookStack\Auth\UserRepo $userRepo
*/
public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
public function __construct(\BookStack\Auth\Access\SocialAuthService $socialAuthService, \BookStack\Auth\Access\EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{
$this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']);
$this->socialAuthService = $socialAuthService;
@ -119,7 +119,7 @@ class RegisterController extends Controller
/**
* Create a new user instance after a valid registration.
* @param array $data
* @return User
* @return \BookStack\Auth\User
*/
protected function create(array $data)
{

12
app/Http/Controllers/BookController.php
View File

@ -1,10 +1,10 @@
<?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Book;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
use BookStack\Entities\Book;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\UserRepo;
use BookStack\Entities\ExportService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;
@ -19,8 +19,8 @@ class BookController extends Controller
/**
* BookController constructor.
* @param EntityRepo $entityRepo
* @param UserRepo $userRepo
* @param ExportService $exportService
* @param \BookStack\Auth\UserRepo $userRepo
* @param \BookStack\Entities\ExportService $exportService
*/
public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
{

14
app/Http/Controllers/BookshelfController.php
View File

@ -1,11 +1,11 @@
<?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Book;
use BookStack\Bookshelf;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\UserRepo;
use BookStack\Entities\ExportService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;
@ -19,9 +19,9 @@ class BookshelfController extends Controller
/**
* BookController constructor.
* @param EntityRepo $entityRepo
* @param \BookStack\Entities\EntityRepo $entityRepo
* @param UserRepo $userRepo
* @param ExportService $exportService
* @param \BookStack\Entities\ExportService $exportService
*/
public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
{

8
app/Http/Controllers/ChapterController.php
View File

@ -1,9 +1,9 @@
<?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\UserRepo;
use BookStack\Entities\ExportService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;
@ -19,7 +19,7 @@ class ChapterController extends Controller
* ChapterController constructor.
* @param EntityRepo $entityRepo
* @param UserRepo $userRepo
* @param ExportService $exportService
* @param \BookStack\Entities\ExportService $exportService
*/
public function __construct(EntityRepo $entityRepo, UserRepo $userRepo, ExportService $exportService)
{

8
app/Http/Controllers/CommentController.php
View File

@ -1,8 +1,8 @@
<?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Repos\CommentRepo;
use BookStack\Repos\EntityRepo;
use BookStack\Actions\CommentRepo;
use BookStack\Entities\EntityRepo;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
@ -13,8 +13,8 @@ class CommentController extends Controller
/**
* CommentController constructor.
* @param EntityRepo $entityRepo
* @param CommentRepo $commentRepo
* @param \BookStack\Entities\EntityRepo $entityRepo
* @param \BookStack\Actions\CommentRepo $commentRepo
*/
public function __construct(EntityRepo $entityRepo, CommentRepo $commentRepo)
{

2
app/Http/Controllers/Controller.php
View File

@ -8,7 +8,7 @@ use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use BookStack\User;
use BookStack\Auth\User;
abstract class Controller extends BaseController
{

2
app/Http/Controllers/HomeController.php
View File

@ -1,7 +1,7 @@
<?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Repos\EntityRepo;
use BookStack\Entities\EntityRepo;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;

6
app/Http/Controllers/ImageController.php
View File

@ -2,11 +2,11 @@
use BookStack\Exceptions\ImageUploadException;
use BookStack\Exceptions\NotFoundException;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\ImageRepo;
use BookStack\Entities\EntityRepo;
use BookStack\Uploads\ImageRepo;
use Illuminate\Filesystem\Filesystem as File;
use Illuminate\Http\Request;
use BookStack\Image;
use BookStack\Uploads\Image;
use BookStack\Repos\PageRepo;
class ImageController extends Controller

10
app/Http/Controllers/PageController.php
View File

@ -2,9 +2,9 @@
use Activity;
use BookStack\Exceptions\NotFoundException;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\UserRepo;
use BookStack\Entities\ExportService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;
@ -19,8 +19,8 @@ class PageController extends Controller
/**
* PageController constructor.
* @param EntityRepo $entityRepo
* @param ExportService $exportService
* @param \BookStack\Entities\EntityRepo $entityRepo
* @param \BookStack\Entities\ExportService $exportService
* @param UserRepo $userRepo
*/
public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo)

4
app/Http/Controllers/PermissionController.php
View File

@ -1,7 +1,7 @@
<?php namespace BookStack\Http\Controllers;
use BookStack\Exceptions\PermissionsException;
use BookStack\Repos\PermissionsRepo;
use BookStack\Auth\Permissions\PermissionsRepo;
use Illuminate\Http\Request;
class PermissionController extends Controller
@ -11,7 +11,7 @@ class PermissionController extends Controller
/**
* PermissionController constructor.
* @param PermissionsRepo $permissionsRepo
* @param \BookStack\Auth\Permissions\PermissionsRepo $permissionsRepo
*/
public function __construct(PermissionsRepo $permissionsRepo)
{

8
app/Http/Controllers/SearchController.php
View File

@ -1,8 +1,8 @@
<?php namespace BookStack\Http\Controllers;
use BookStack\Repos\EntityRepo;
use BookStack\Services\SearchService;
use BookStack\Services\ViewService;
use BookStack\Entities\EntityRepo;
use BookStack\Entities\SearchService;
use BookStack\Actions\ViewService;
use Illuminate\Http\Request;
class SearchController extends Controller
@ -97,7 +97,7 @@ class SearchController extends Controller
$entities = $this->searchService->searchEntities($searchTerm, 'all', 1, 20, $permission)['results'];
} else {
$entityNames = $entityTypes->map(function ($type) {
return 'BookStack\\' . ucfirst($type);
return 'BookStack\\' . ucfirst($type); // TODO - Extract this elsewhere, too specific and stringy
})->toArray();
$entities = $this->viewService->getPopular(20, 0, $entityNames, $permission);
}

2
app/Http/Controllers/SettingController.php
View File

@ -1,6 +1,6 @@
<?php namespace BookStack\Http\Controllers;
use BookStack\Services\ImageService;
use BookStack\Uploads\ImageService;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Setting;

2
app/Http/Controllers/TagController.php
View File

@ -1,6 +1,6 @@
<?php namespace BookStack\Http\Controllers;
use BookStack\Repos\TagRepo;
use BookStack\Actions\TagRepo;
use Illuminate\Http\Request;
class TagController extends Controller

10
app/Http/Controllers/UserController.php
View File

@ -3,9 +3,9 @@
use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use BookStack\Repos\UserRepo;
use BookStack\Services\SocialAuthService;
use BookStack\User;
use BookStack\Auth\UserRepo;
use BookStack\Auth\Access\SocialAuthService;
use BookStack\Auth\User;
class UserController extends Controller
{
@ -16,7 +16,7 @@ class UserController extends Controller
/**
* UserController constructor.
* @param User $user
* @param UserRepo $userRepo
* @param \BookStack\Auth\UserRepo $userRepo
*/
public function __construct(User $user, UserRepo $userRepo)
{
@ -101,7 +101,7 @@ class UserController extends Controller
/**
* Show the form for editing the specified user.
* @param int $id
* @param SocialAuthService $socialAuthService
* @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
* @return Response
*/
public function edit($id, SocialAuthService $socialAuthService)

2
app/Ownable.php
View File

@ -1,5 +1,7 @@
<?php namespace BookStack;
use BookStack\Auth\User;
abstract class Ownable extends Model
{
/**

24
app/Providers/AppServiceProvider.php
View File

@ -1,8 +1,15 @@
<?php namespace BookStack\Providers;
use BookStack\Services\SettingService;
use BookStack\Setting;
use Blade;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
use BookStack\Settings\SettingService;
use BookStack\Settings\Setting;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\ServiceProvider;
use Schema;
use Validator;
class AppServiceProvider extends ServiceProvider
@ -20,12 +27,21 @@ class AppServiceProvider extends ServiceProvider
return in_array($value->getMimeType(), $imageMimes);
});
\Blade::directive('icon', function ($expression) {
// Custom blade view directives
Blade::directive('icon', function ($expression) {
return "<?php echo icon($expression); ?>";
});
// Allow longer string lengths after upgrade to utf8mb4
\Schema::defaultStringLength(191);
Schema::defaultStringLength(191);
// Set morph-map due to namespace changes
Relation::morphMap([
'BookStack\\Bookshelf' => Bookshelf::class,
'BookStack\\Book' => Book::class,
'BookStack\\Chapter' => Chapter::class,
'BookStack\\Page' => Page::class,
]);
}
/**

2
app/Providers/AuthServiceProvider.php
View File

@ -3,7 +3,7 @@
namespace BookStack\Providers;
use Auth;
use BookStack\Services\LdapService;
use BookStack\Auth\Access\LdapService;
use Illuminate\Support\ServiceProvider;
class AuthServiceProvider extends ServiceProvider

18
app/Providers/CustomFacadeProvider.php
View File

@ -2,18 +2,18 @@
namespace BookStack\Providers;
use BookStack\Activity;
use BookStack\Image;
use BookStack\Services\ImageService;
use BookStack\Services\PermissionService;
use BookStack\Services\ViewService;
use BookStack\Setting;
use BookStack\View;
use BookStack\Actions\Activity;
use BookStack\Uploads\Image;
use BookStack\Uploads\ImageService;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Actions\ViewService;
use BookStack\Settings\Setting;
use BookStack\Actions\View;
use Illuminate\Contracts\Cache\Repository;
use Illuminate\Contracts\Filesystem\Factory;
use Illuminate\Support\ServiceProvider;
use BookStack\Services\ActivityService;
use BookStack\Services\SettingService;
use BookStack\Actions\ActivityService;
use BookStack\Settings\SettingService;
use Intervention\Image\ImageManager;
class CustomFacadeProvider extends ServiceProvider

10
app/Providers/LdapUserProvider.php
View File

@ -2,9 +2,9 @@
namespace BookStack\Providers;
use BookStack\Role;
use BookStack\Services\LdapService;
use BookStack\User;
use BookStack\Auth\Role;
use BookStack\Auth\Access\LdapService;
use BookStack\Auth\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Contracts\Auth\UserProvider;
@ -19,7 +19,7 @@ class LdapUserProvider implements UserProvider
protected $model;
/**
* @var LdapService
* @var \BookStack\Auth\LdapService
*/
protected $ldapService;
@ -27,7 +27,7 @@ class LdapUserProvider implements UserProvider
/**
* LdapUserProvider constructor.
* @param $model
* @param LdapService $ldapService
* @param \BookStack\Auth\LdapService $ldapService
*/
public function __construct($model, LdapService $ldapService)
{

4
app/Setting.php → app/Settings/Setting.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Settings;
use BookStack\Model;
class Setting extends Model
{

10
app/Services/SettingService.php → app/Settings/SettingService.php
View File

@ -1,7 +1,7 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Settings;
use BookStack\Setting;
use BookStack\User;
use BookStack\Settings\Setting;
use BookStack\Auth\User;
use Illuminate\Contracts\Cache\Repository as Cache;
/**
@ -55,7 +55,7 @@ class SettingService
/**
* Get a user-specific setting from the database or cache.
* @param User $user
* @param \BookStack\Auth\User $user
* @param $key
* @param bool $default
* @return bool|string
@ -174,7 +174,7 @@ class SettingService
/**
* Put a user-specific setting into the database.
* @param User $user
* @param \BookStack\Auth\User $user
* @param $key
* @param $value
* @return bool

5
app/Attachment.php → app/Uploads/Attachment.php
View File

@ -1,4 +1,7 @@
<?php namespace BookStack;
<?php namespace BookStack\Uploads;
use BookStack\Entities\Page;
use BookStack\Ownable;
class Attachment extends Ownable
{

5
app/Services/AttachmentService.php → app/Uploads/AttachmentService.php
View File

@ -1,7 +1,8 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Uploads;
use BookStack\Exceptions\FileUploadException;
use BookStack\Attachment;
use BookStack\Uploads\Attachment;
use BookStack\Uploads\UploadService;
use Exception;
use Symfony\Component\HttpFoundation\File\UploadedFile;

3
app/Image.php → app/Uploads/Image.php
View File

@ -1,5 +1,6 @@
<?php namespace BookStack;
<?php namespace BookStack\Uploads;
use BookStack\Ownable;
use Images;
class Image extends Ownable

14
app/Repos/ImageRepo.php → app/Uploads/ImageRepo.php
View File

@ -1,9 +1,9 @@
<?php namespace BookStack\Repos;
<?php namespace BookStack\Uploads;
use BookStack\Image;
use BookStack\Page;
use BookStack\Services\ImageService;
use BookStack\Services\PermissionService;
use BookStack\Uploads\Image;
use BookStack\Entities\Page;
use BookStack\Uploads\ImageService;
use BookStack\Auth\Permissions\PermissionService;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class ImageRepo
@ -18,8 +18,8 @@ class ImageRepo
* ImageRepo constructor.
* @param Image $image
* @param ImageService $imageService
* @param PermissionService $permissionService
* @param Page $page
* @param \BookStack\Auth\\BookStack\Auth\Permissions\PermissionService $permissionService
* @param \BookStack\Entities\Page $page
*/
public function __construct(Image $image, ImageService $imageService, PermissionService $permissionService, Page $page)
{

9
app/Services/ImageService.php → app/Uploads/ImageService.php
View File

@ -1,8 +1,9 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Uploads;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Image;
use BookStack\User;
use BookStack\Uploads\Image;
use BookStack\Auth\User;
use BookStack\Uploads\UploadService;
use DB;
use Exception;
use Intervention\Image\Exception\NotSupportedException;
@ -281,7 +282,7 @@ class ImageService extends UploadService
/**
* Save a gravatar image and set a the profile image for a user.
* @param User $user
* @param \BookStack\Auth\User $user
* @param int $size
* @return mixed
* @throws Exception

4
app/Services/UploadService.php → app/Uploads/UploadService.php
View File

@ -1,9 +1,9 @@
<?php namespace BookStack\Services;
<?php namespace BookStack\Uploads;
use Illuminate\Contracts\Filesystem\Factory as FileSystem;
use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance;
class UploadService
abstract class UploadService
{
/**

10
app/helpers.php
View File

@ -30,11 +30,11 @@ function versioned_asset($file = '')
/**
* Helper method to get the current User.
* Defaults to public 'Guest' user if not logged in.
* @return \BookStack\User
* @return \BookStack\Auth\User
*/
function user()
{
return auth()->user() ?: \BookStack\User::getDefault();
return auth()->user() ?: \BookStack\Auth\User::getDefault();
}
/**
@ -61,7 +61,7 @@ function userCan($permission, Ownable $ownable = null)
}
// Check permission on ownable item
$permissionService = app(\BookStack\Services\PermissionService::class);
$permissionService = app(\BookStack\Auth\Permissions\PermissionService::class);
return $permissionService->checkOwnableUserAccess($ownable, $permission);
}
@ -69,11 +69,11 @@ function userCan($permission, Ownable $ownable = null)
* Helper to access system settings.
* @param $key
* @param bool $default
* @return bool|string|\BookStack\Services\SettingService
* @return bool|string|\BookStack\Settings\SettingService
*/
function setting($key = null, $default = false)
{
$settingService = resolve(\BookStack\Services\SettingService::class);
$settingService = resolve(\BookStack\Settings\SettingService::class);
if (is_null($key)) {
return $settingService;
}

8
config/app.php
View File

@ -274,10 +274,10 @@ return [
* Custom
*/
'Activity' => BookStack\Services\Facades\Activity::class,
'Setting' => BookStack\Services\Facades\Setting::class,
'Views' => BookStack\Services\Facades\Views::class,
'Images' => BookStack\Services\Facades\Images::class,
'Activity' => BookStack\Facades\Activity::class,
'Setting' => BookStack\Facades\Setting::class,
'Views' => BookStack\Facades\Views::class,
'Images' => BookStack\Facades\Images::class,
],

2
config/auth.php
View File

@ -70,7 +70,7 @@ return [
'providers' => [
'users' => [
'driver' => env('AUTH_METHOD', 'standard') === 'standard' ? 'eloquent' : env('AUTH_METHOD'),
'model' => BookStack\User::class,
'model' => \BookStack\Auth\User::class,
],
// 'users' => [

2
config/services.php
View File

@ -38,7 +38,7 @@ return [
],
'stripe' => [
'model' => BookStack\User::class,
'model' => \BookStack\Auth\User::class,
'key' => '',
'secret' => '',
],

18
database/factories/ModelFactory.php
View File

@ -11,7 +11,7 @@
|
*/
$factory->define(BookStack\User::class, function ($faker) {
$factory->define(\BookStack\Auth\User::class, function ($faker) {
return [
'name' => $faker->name,
'email' => $faker->email,
@ -21,7 +21,7 @@ $factory->define(BookStack\User::class, function ($faker) {
];
});
$factory->define(BookStack\Bookshelf::class, function ($faker) {
$factory->define(\BookStack\Entities\Bookshelf::class, function ($faker) {
return [
'name' => $faker->sentence,
'slug' => str_random(10),
@ -29,7 +29,7 @@ $factory->define(BookStack\Bookshelf::class, function ($faker) {
];
});
$factory->define(BookStack\Book::class, function ($faker) {
$factory->define(\BookStack\Entities\Book::class, function ($faker) {
return [
'name' => $faker->sentence,
'slug' => str_random(10),
@ -37,7 +37,7 @@ $factory->define(BookStack\Book::class, function ($faker) {
];
});
$factory->define(BookStack\Chapter::class, function ($faker) {
$factory->define(\BookStack\Entities\Chapter::class, function ($faker) {
return [
'name' => $faker->sentence,
'slug' => str_random(10),
@ -45,7 +45,7 @@ $factory->define(BookStack\Chapter::class, function ($faker) {
];
});
$factory->define(BookStack\Page::class, function ($faker) {
$factory->define(\BookStack\Entities\Page::class, function ($faker) {
$html = '<p>' . implode('</p>', $faker->paragraphs(5)) . '</p>';
return [
'name' => $faker->sentence,
@ -56,21 +56,21 @@ $factory->define(BookStack\Page::class, function ($faker) {
];
});
$factory->define(BookStack\Role::class, function ($faker) {
$factory->define(\BookStack\Auth\Role::class, function ($faker) {
return [
'display_name' => $faker->sentence(3),
'description' => $faker->sentence(10)
];
});
$factory->define(BookStack\Tag::class, function ($faker) {
$factory->define(\BookStack\Actions\Tag::class, function ($faker) {
return [
'name' => $faker->city,
'value' => $faker->sentence(3)
];
});
$factory->define(BookStack\Image::class, function ($faker) {
$factory->define(\BookStack\Uploads\Image::class, function ($faker) {
return [
'name' => $faker->slug . '.jpg',
'url' => $faker->url,
@ -80,7 +80,7 @@ $factory->define(BookStack\Image::class, function ($faker) {
];
});
$factory->define(BookStack\Comment::class, function($faker) {
$factory->define(\BookStack\Actions\Comment::class, function($faker) {
$text = $faker->paragraph(1);
$html = '<p>' . $text. '</p>';
return [

2
database/migrations/2015_12_07_195238_add_image_upload_types.php
View File

@ -1,6 +1,6 @@
<?php
use BookStack\Image;
use BookStack\Uploads\Image;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

12
database/migrations/2018_08_04_115700_create_bookshelves_table.php
View File

@ -119,11 +119,11 @@ class CreateBookshelvesTable extends Migration
Schema::dropIfExists('bookshelves');
// Drop related polymorphic items
DB::table('activities')->where('entity_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('views')->where('viewable_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('entity_permissions')->where('restrictable_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('tags')->where('entity_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('search_terms')->where('entity_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('comments')->where('entity_type', '=', 'BookStack\Bookshelf')->delete();
DB::table('activities')->where('entity_type', '=', 'BookStack\Entities\Bookshelf')->delete();
DB::table('views')->where('viewable_type', '=', 'BookStack\Entities\Bookshelf')->delete();
DB::table('entity_permissions')->where('restrictable_type', '=', 'BookStack\Entities\Bookshelf')->delete();
DB::table('tags')->where('entity_type', '=', 'BookStack\Entities\Bookshelf')->delete();
DB::table('search_terms')->where('entity_type', '=', 'BookStack\Entities\Bookshelf')->delete();
DB::table('comments')->where('entity_type', '=', 'BookStack\Entities\Bookshelf')->delete();
}
}

28
database/seeds/DummyContentSeeder.php
View File

@ -12,39 +12,39 @@ class DummyContentSeeder extends Seeder
public function run()
{
// Create an editor user
$editorUser = factory(\BookStack\User::class)->create();
$editorRole = \BookStack\Role::getRole('editor');
$editorUser = factory(\BookStack\Auth\User::class)->create();
$editorRole = \BookStack\Auth\Role::getRole('editor');
$editorUser->attachRole($editorRole);
// Create a viewer user
$viewerUser = factory(\BookStack\User::class)->create();
$role = \BookStack\Role::getRole('viewer');
$viewerUser = factory(\BookStack\Auth\User::class)->create();
$role = \BookStack\Auth\Role::getRole('viewer');
$viewerUser->attachRole($role);
$byData = ['created_by' => $editorUser->id, 'updated_by' => $editorUser->id];
factory(\BookStack\Book::class, 5)->create($byData)
factory(\BookStack\Entities\Book::class, 5)->create($byData)
->each(function($book) use ($editorUser, $byData) {
$chapters = factory(\BookStack\Chapter::class, 3)->create($byData)
$chapters = factory(\BookStack\Entities\Chapter::class, 3)->create($byData)
->each(function($chapter) use ($editorUser, $book, $byData){
$pages = factory(\BookStack\Page::class, 3)->make(array_merge($byData, ['book_id' => $book->id]));
$pages = factory(\BookStack\Entities\Page::class, 3)->make(array_merge($byData, ['book_id' => $book->id]));
$chapter->pages()->saveMany($pages);
});
$pages = factory(\BookStack\Page::class, 3)->make($byData);
$pages = factory(\BookStack\Entities\Page::class, 3)->make($byData);
$book->chapters()->saveMany($chapters);
$book->pages()->saveMany($pages);
});
$largeBook = factory(\BookStack\Book::class)->create(array_merge($byData, ['name' => 'Large book' . str_random(10)]));
$pages = factory(\BookStack\Page::class, 200)->make($byData);
$chapters = factory(\BookStack\Chapter::class, 50)->make($byData);
$largeBook = factory(\BookStack\Entities\Book::class)->create(array_merge($byData, ['name' => 'Large book' . str_random(10)]));
$pages = factory(\BookStack\Entities\Page::class, 200)->make($byData);
$chapters = factory(\BookStack\Entities\Chapter::class, 50)->make($byData);
$largeBook->pages()->saveMany($pages);
$largeBook->chapters()->saveMany($chapters);
$shelves = factory(\BookStack\Bookshelf::class, 10)->create($byData);
$shelves = factory(\BookStack\Entities\Bookshelf::class, 10)->create($byData);
$largeBook->shelves()->attach($shelves->pluck('id'));
app(\BookStack\Services\PermissionService::class)->buildJointPermissions();
app(\BookStack\Services\SearchService::class)->indexAllEntities();
app(\BookStack\Auth\Permissions\PermissionService::class)->buildJointPermissions();
app(\BookStack\Entities\SearchService::class)->indexAllEntities();
}
}

14
database/seeds/LargeContentSeeder.php
View File

@ -12,16 +12,16 @@ class LargeContentSeeder extends Seeder
public function run()
{
// Create an editor user
$editorUser = factory(\BookStack\User::class)->create();
$editorRole = \BookStack\Role::getRole('editor');
$editorUser = factory(\BookStack\Auth\User::class)->create();
$editorRole = \BookStack\Auth\Role::getRole('editor');
$editorUser->attachRole($editorRole);
$largeBook = factory(\BookStack\Book::class)->create(['name' => 'Large book' . str_random(10), 'created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$pages = factory(\BookStack\Page::class, 200)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$chapters = factory(\BookStack\Chapter::class, 50)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$largeBook = factory(\BookStack\Entities\Book::class)->create(['name' => 'Large book' . str_random(10), 'created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$pages = factory(\BookStack\Entities\Page::class, 200)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$chapters = factory(\BookStack\Entities\Chapter::class, 50)->make(['created_by' => $editorUser->id, 'updated_by' => $editorUser->id]);
$largeBook->pages()->saveMany($pages);
$largeBook->chapters()->saveMany($chapters);
app(\BookStack\Services\PermissionService::class)->buildJointPermissions();
app(\BookStack\Services\SearchService::class)->indexAllEntities();
app(\BookStack\Auth\Permissions\PermissionService::class)->buildJointPermissions();
app(\BookStack\Entities\SearchService::class)->indexAllEntities();
}
}

2
resources/views/components/page-picker.blade.php
View File

@ -3,7 +3,7 @@
<div page-picker>
<div class="input-base">
<span @if($value) style="display: none" @endif page-picker-default class="text-muted italic">{{ $placeholder }}</span>
<a @if(!$value) style="display: none" @endif href="{{ baseUrl('/link/' . $value) }}" target="_blank" class="text-page" page-picker-display>#{{$value}}, {{$value ? \BookStack\Page::find($value)->name : '' }}</a>
<a @if(!$value) style="display: none" @endif href="{{ baseUrl('/link/' . $value) }}" target="_blank" class="text-page" page-picker-display>#{{$value}}, {{$value ? \BookStack\Entities\Page::find($value)->name : '' }}</a>
</div>
<br>
<input type="hidden" value="{{$value}}" name="{{$name}}" id="{{$name}}">

6
resources/views/errors/404.blade.php
View File

@ -18,19 +18,19 @@
<div class="col-md-4">
<div class="card">
<h3 class="text-muted">@icon('page') {{ trans('entities.pages_popular') }}</h3>
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Entities\Page::class]), 'style' => 'compact'])
</div>
</div>
<div class="col-md-4">
<div class="card">
<h3 class="text-muted">@icon('book') {{ trans('entities.books_popular') }}</h3>
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Entities\Book::class]), 'style' => 'compact'])
</div>
</div>
<div class="col-md-4">
<div class="card">
<h3 class="text-muted">@icon('chapter') {{ trans('entities.chapters_popular') }}</h3>
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Entities\Chapter::class]), 'style' => 'compact'])
</div>
</div>
</div>

4
resources/views/settings/index.blade.php
View File

@ -127,9 +127,9 @@
<div class="form-group">
<label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
<select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
@foreach(\BookStack\Role::all() as $role)
@foreach(\BookStack\Auth\Role::all() as $role)
<option value="{{$role->id}}" data-role-name="{{ $role->name }}"
@if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
@if(setting('registration-role', \BookStack\Auth\Role::first()->id) == $role->id) selected @endif
>
{{ $role->display_name }}
</option>

6
tests/ActivityTrackingTest.php
View File

@ -1,12 +1,14 @@
<?php namespace Tests;
use BookStack\Entities\Book;
class ActivityTrackingTest extends BrowserKitTest
{
public function test_recently_viewed_books()
{
$books = \BookStack\Book::all()->take(10);
$books = Book::all()->take(10);
$this->asAdmin()->visit('/books')
->dontSeeInElement('#recents', $books[0]->name)
@ -20,7 +22,7 @@ class ActivityTrackingTest extends BrowserKitTest
public function test_popular_books()
{
$books = \BookStack\Book::all()->take(10);
$books = Book::all()->take(10);
$this->asAdmin()->visit('/books')
->dontSeeInElement('#popular', $books[0]->name)

14
tests/AttachmentTest.php
View File

@ -1,8 +1,8 @@
<?php namespace Tests;
use BookStack\Attachment;
use BookStack\Page;
use BookStack\Services\PermissionService;
use BookStack\Uploads\Attachment;
use BookStack\Entities\Page;
use BookStack\Auth\Permissions\PermissionService;
class AttachmentTest extends TestCase
{
@ -44,8 +44,8 @@ class AttachmentTest extends TestCase
*/
protected function deleteUploads()
{
$fileService = $this->app->make(\BookStack\Services\AttachmentService::class);
foreach (\BookStack\Attachment::all() as $file) {
$fileService = $this->app->make(\BookStack\Uploads\AttachmentService::class);
foreach (\BookStack\Uploads\Attachment::all() as $file) {
$fileService->deleteFile($file);
}
}
@ -144,7 +144,7 @@ class AttachmentTest extends TestCase
'uploaded_to' => $page->id,
]);
$attachmentId = \BookStack\Attachment::first()->id;
$attachmentId = \BookStack\Uploads\Attachment::first()->id;
$update = $this->call('PUT', 'attachments/' . $attachmentId, [
'uploaded_to' => $page->id,
@ -175,7 +175,7 @@ class AttachmentTest extends TestCase
$filePath = base_path('storage/' . $this->getUploadPath($fileName));
$this->assertTrue(file_exists($filePath), 'File at path ' . $filePath . ' does not exist');
$attachment = \BookStack\Attachment::first();
$attachment = \BookStack\Uploads\Attachment::first();
$this->delete($attachment->getUrl());
$this->assertDatabaseMissing('attachments', [

7
tests/Auth/AuthTest.php
View File

@ -1,7 +1,8 @@
<?php namespace Tests;
use BookStack\Notifications\ConfirmEmail;
use BookStack\User;
use BookStack\Auth\User;
use BookStack\Settings\SettingService;
use Illuminate\Support\Facades\Notification;
class AuthTest extends BrowserKitTest
@ -21,7 +22,7 @@ class AuthTest extends BrowserKitTest
public function test_public_viewing()
{
$settings = app('BookStack\Services\SettingService');
$settings = app(SettingService::class);
$settings->put('app-public', 'true');
$this->visit('/')
->seePageIs('/')
@ -248,7 +249,7 @@ class AuthTest extends BrowserKitTest
public function test_user_cannot_be_deleted_if_last_admin()
{
$adminRole = \BookStack\Role::getRole('admin');
$adminRole = \BookStack\Auth\Role::getRole('admin');
// Ensure we currently only have 1 admin user
$this->assertEquals(1, $adminRole->users()->count());
$user = $adminRole->users->first();

6
tests/Auth/LdapTest.php
View File

@ -1,7 +1,7 @@
<?php namespace Tests;
use BookStack\Role;
use BookStack\Services\Ldap;
use BookStack\User;
use BookStack\Auth\Role;
use BookStack\Auth\Access\Ldap;
use BookStack\Auth\User;
use Mockery\MockInterface;
class LdapTest extends BrowserKitTest

6
tests/Auth/SocialAuthTest.php
View File

@ -6,7 +6,7 @@ class SocialAuthTest extends TestCase
public function test_social_registration()
{
// http://docs.mockery.io/en/latest/reference/startup_methods.html
$user = factory(\BookStack\User::class)->make();
$user = factory(\BookStack\Auth\User::class)->make();
$this->setSettings(['registration-enabled' => 'true']);
config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
@ -86,7 +86,7 @@ class SocialAuthTest extends TestCase
'APP_URL' => 'http://localhost'
]);
$user = factory(\BookStack\User::class)->make();
$user = factory(\BookStack\Auth\User::class)->make();
$mockSocialite = \Mockery::mock('Laravel\Socialite\Contracts\Factory');
$this->app['Laravel\Socialite\Contracts\Factory'] = $mockSocialite;
$mockSocialDriver = \Mockery::mock('Laravel\Socialite\Contracts\Provider');
@ -125,7 +125,7 @@ class SocialAuthTest extends TestCase
'APP_URL' => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true
]);
$user = factory(\BookStack\User::class)->make();
$user = factory(\BookStack\Auth\User::class)->make();
$mockSocialite = \Mockery::mock('Laravel\Socialite\Contracts\Factory');
$this->app['Laravel\Socialite\Contracts\Factory'] = $mockSocialite;
$mockSocialDriver = \Mockery::mock('Laravel\Socialite\Contracts\Provider');

19
tests/BrowserKitTest.php
View File

@ -1,8 +1,9 @@
<?php namespace Tests;
use BookStack\Entity;
use BookStack\Role;
use BookStack\Services\PermissionService;
use BookStack\Entities\Entity;
use BookStack\Auth\Role;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Settings\SettingService;
use Illuminate\Contracts\Console\Kernel;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Laravel\BrowserKitTesting\TestCase;
@ -46,7 +47,7 @@ abstract class BrowserKitTest extends TestCase
*/
public function getNormalUser()
{
return \BookStack\User::where('system_name', '=', null)->get()->last();
return \BookStack\Auth\User::where('system_name', '=', null)->get()->last();
}
/**
@ -55,7 +56,7 @@ abstract class BrowserKitTest extends TestCase
*/
protected function setSettings($settingsArray)
{
$settings = app('BookStack\Services\SettingService');
$settings = app(SettingService::class);
foreach ($settingsArray as $key => $value) {
$settings->put($key, $value);
}
@ -70,9 +71,9 @@ abstract class BrowserKitTest extends TestCase
protected function createEntityChainBelongingToUser($creatorUser, $updaterUser = false)
{
if ($updaterUser === false) $updaterUser = $creatorUser;
$book = factory(\BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
$chapter = factory(\BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
$page = factory(\BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id, 'chapter_id' => $chapter->id]);
$book = factory(\BookStack\Entities\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
$chapter = factory(\BookStack\Entities\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
$page = factory(\BookStack\Entities\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id, 'chapter_id' => $chapter->id]);
$restrictionService = $this->app[PermissionService::class];
$restrictionService->buildJointPermissionsForEntity($book);
return [
@ -100,7 +101,7 @@ abstract class BrowserKitTest extends TestCase
*/
protected function getNewBlankUser($attributes = [])
{
$user = factory(\BookStack\User::class)->create($attributes);
$user = factory(\BookStack\Auth\User::class)->create($attributes);
return $user;
}

8
tests/CommandsTest.php
View File

@ -1,9 +1,9 @@
<?php namespace Tests;
use BookStack\JointPermission;
use BookStack\Page;
use BookStack\Repos\EntityRepo;
use BookStack\User;
use BookStack\Auth\Permissions\JointPermission;
use BookStack\Entities\Page;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\User;
class CommandsTest extends TestCase
{

4
tests/Entity/BookShelfTest.php
View File

@ -1,7 +1,7 @@
<?php namespace Tests;
use BookStack\Book;
use BookStack\Bookshelf;
use BookStack\Entities\Book;
use BookStack\Entities\Bookshelf;
class BookShelfTest extends TestCase
{

2
tests/Entity/CommentSettingTest.php
View File

@ -5,7 +5,7 @@ class CommentSettingTest extends BrowserKitTest {
public function setUp() {
parent::setUp();
$this->page = \BookStack\Page::first();
$this->page = \BookStack\Entities\Page::first();
}
public function test_comment_disable () {

6
tests/Entity/CommentTest.php
View File

@ -1,7 +1,7 @@
<?php namespace Tests;
use BookStack\Page;
use BookStack\Comment;
use BookStack\Entities\Page;
use BookStack\Actions\Comment;
class CommentTest extends TestCase
{
@ -23,7 +23,7 @@ class CommentTest extends TestCase
$this->assertDatabaseHas('comments', [
'local_id' => 1,
'entity_id' => $page->id,
'entity_type' => 'BookStack\\Page',
'entity_type' => Page::newModelInstance()->getMorphClass(),
'text' => $comment->text,
'parent_id' => 2
]);

16
tests/Entity/EntitySearchTest.php
View File

@ -1,16 +1,16 @@
<?php namespace Tests;
use BookStack\Bookshelf;
use BookStack\Chapter;
use BookStack\Page;
use BookStack\Entities\Bookshelf;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
class EntitySearchTest extends TestCase
{
public function test_page_search()
{
$book = \BookStack\Book::all()->first();
$book = \BookStack\Entities\Book::all()->first();
$page = $book->pages->first();
$search = $this->asEditor()->get('/search?term=' . urlencode($page->name));
@ -54,7 +54,7 @@ class EntitySearchTest extends TestCase
public function test_book_search()
{
$book = \BookStack\Book::first();
$book = \BookStack\Entities\Book::first();
$page = $book->pages->last();
$chapter = $book->chapters->last();
@ -67,7 +67,7 @@ class EntitySearchTest extends TestCase
public function test_chapter_search()
{
$chapter = \BookStack\Chapter::has('pages')->first();
$chapter = \BookStack\Entities\Chapter::has('pages')->first();
$page = $chapter->pages[0];
$pageTestResp = $this->asEditor()->get('/search/chapter/' . $chapter->id . '?term=' . urlencode($page->name));
@ -77,11 +77,11 @@ class EntitySearchTest extends TestCase
public function test_tag_search()
{
$newTags = [
new \BookStack\Tag([
new \BookStack\Actions\Tag([
'name' => 'animal',
'value' => 'cat'
]),
new \BookStack\Tag([
new \BookStack\Actions\Tag([
'name' => 'color',
'value' => 'red'
])

10
tests/Entity/EntityTest.php
View File

@ -1,10 +1,10 @@
<?php namespace Tests;
use BookStack\Book;
use BookStack\Chapter;
use BookStack\Page;
use BookStack\Repos\EntityRepo;
use BookStack\Repos\UserRepo;
use BookStack\Entities\Book;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
use BookStack\Entities\EntityRepo;
use BookStack\Auth\UserRepo;
use Carbon\Carbon;
class EntityTest extends BrowserKitTest

4
tests/Entity/ExportTest.php
View File

@ -1,8 +1,8 @@
<?php namespace Tests;
use BookStack\Chapter;
use BookStack\Page;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
class ExportTest extends TestCase
{

2
tests/Entity/MarkdownTest.php
View File

@ -7,7 +7,7 @@ class MarkdownTest extends BrowserKitTest
public function setUp()
{
parent::setUp();
$this->page = \BookStack\Page::first();
$this->page = \BookStack\Entities\Page::first();
}
protected function setMarkdownEditor()

4
tests/Entity/PageContentTest.php
View File

@ -1,7 +1,7 @@
<?php namespace Tests;
use BookStack\Page;
use BookStack\Repos\EntityRepo;
use BookStack\Entities\Page;
use BookStack\Entities\EntityRepo;
class PageContentTest extends TestCase
{

10
tests/Entity/PageDraftTest.php
View File

@ -9,8 +9,8 @@ class PageDraftTest extends BrowserKitTest
public function setUp()
{
parent::setUp();
$this->page = \BookStack\Page::first();
$this->entityRepo = app('\BookStack\Repos\EntityRepo');
$this->page = \BookStack\Entities\Page::first();
$this->entityRepo = app('\BookStack\Entities\EntityRepo');
}
public function test_draft_content_shows_if_available()
@ -48,7 +48,7 @@ class PageDraftTest extends BrowserKitTest
public function test_alert_message_shows_if_someone_else_editing()
{
$nonEditedPage = \BookStack\Page::take(10)->get()->last();
$nonEditedPage = \BookStack\Entities\Page::take(10)->get()->last();
$addedContent = '<p>test message content</p>';
$this->asAdmin()->visit($this->page->getUrl() . '/edit')
->dontSeeInField('html', $addedContent);
@ -67,7 +67,7 @@ class PageDraftTest extends BrowserKitTest
public function test_draft_pages_show_on_homepage()
{
$book = \BookStack\Book::first();
$book = \BookStack\Entities\Book::first();
$this->asAdmin()->visit('/')
->dontSeeInElement('#recent-drafts', 'New Page')
->visit($book->getUrl() . '/create-page')
@ -77,7 +77,7 @@ class PageDraftTest extends BrowserKitTest
public function test_draft_pages_not_visible_by_others()
{
$book = \BookStack\Book::first();
$book = \BookStack\Entities\Book::first();
$chapter = $book->chapters->first();
$newUser = $this->getEditor();

Some files were not shown because too many files have changed in this diff Show More