Merge branch 'master' into docker-tests

Author: ssddanbrown

.env.example.complete

@@ -195,6 +195,7 @@ LDAP_DN=false
 LDAP_PASS=false
 LDAP_USER_FILTER=false
 LDAP_VERSION=false
+LDAP_START_TLS=false
 LDAP_TLS_INSECURE=false
 LDAP_ID_ATTRIBUTE=uid
 LDAP_EMAIL_ATTRIBUTE=mail
@@ -245,10 +246,15 @@ AVATAR_URL=
 DRAWIO=true
 
 # Default item listing view
-# Used for public visitors and user's without a preference
-# Can be 'list' or 'grid'
+# Used for public visitors and user's without a preference.
+# Can be 'list' or 'grid'.
 APP_VIEWS_BOOKS=list
 APP_VIEWS_BOOKSHELVES=grid
+APP_VIEWS_BOOKSHELF=grid
+
+# Use dark mode by default
+# Will be overriden by any user/session preference.
+APP_DEFAULT_DARK_MODE=false
 
 # Page revision limit
 # Number of page revisions to keep in the system before deleting old revisions.

.github/workflows/phpunit.yml

@@ -5,6 +5,7 @@ on:
  branches:
  - master
  - release
+ - gh_actions_update
  pull_request:
  branches:
  - '*'
@@ -13,13 +14,19 @@ on:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
  strategy:
  matrix:
- php: [7.2, 7.4]
+ php: ['7.3', '7.4', '8.0']
  steps:
  - uses: actions/checkout@v1
 
+ - name: Setup PHP
+ uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+ with:
+ php-version: ${{ matrix.php }}
+ extensions: gd, mbstring, json, curl, xml, mysql, ldap
+
  - name: Get Composer Cache Directory
  id: composer-cache
  run: |
@@ -38,7 +45,7 @@ jobs:
  - name: Setup Database
  run: |
  mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;'
- mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';"
+ mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';"
  mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
  mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
 

.github/workflows/test-migrations.yml

@@ -5,6 +5,7 @@ on:
  branches:
  - master
  - release
+ - gh_actions_update
  pull_request:
  branches:
  - '*'
@@ -13,13 +14,19 @@ on:
 
 jobs:
  build:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
  strategy:
  matrix:
- php: [7.2, 7.4]
+ php: ['7.3', '7.4', '8.0']
  steps:
  - uses: actions/checkout@v1
 
+ - name: Setup PHP
+ uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+ with:
+ php-version: ${{ matrix.php }}
+ extensions: gd, mbstring, json, curl, xml, mysql, ldap
+
  - name: Get Composer Cache Directory
  id: composer-cache
  run: |
@@ -38,7 +45,7 @@ jobs:
  - name: Create database & user
  run: |
  mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;'
- mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';"
+ mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';"
  mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
  mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
 

app/Actions/Activity.php

@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Str;
 
 /**
@@ -23,7 +24,7 @@ class Activity extends Model
  /**
  * Get the entity for this activity.
  */
- public function entity()
+ public function entity(): MorphTo
  {
  if ($this->entity_type === '') {
  $this->entity_type = null;

app/Actions/ActivityService.php

@@ -78,7 +78,7 @@ public function removeEntity(Entity $entity)
  public function latest(int $count = 20, int $page = 0): array
  {
  $activityList = $this->permissionService
- ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+ ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
  ->orderBy('created_at', 'desc')
  ->with(['user', 'entity'])
  ->skip($count * $page)
@@ -131,7 +131,7 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
  public function userActivity(User $user, int $count = 20, int $page = 0): array
  {
  $activityList = $this->permissionService
- ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+ ->filterRestrictedEntityRelations($this->activity->newQuery(), 'activities', 'entity_id', 'entity_type')
  ->orderBy('created_at', 'desc')
  ->where('user_id', '=', $user->id)
  ->skip($count * $page)

app/Actions/ActivityType.php

@@ -48,4 +48,4 @@ class ActivityType
  const AUTH_PASSWORD_RESET_UPDATE = 'auth_password_reset_update';
  const AUTH_LOGIN = 'auth_login';
  const AUTH_REGISTER = 'auth_register';
-}
+}

app/Actions/TagRepo.php

@@ -26,7 +26,9 @@ public function __construct(Tag $tag, PermissionService $ps)
  */
  public function getNameSuggestions(?string $searchTerm): Collection
  {
- $query = $this->tag->select('*', DB::raw('count(*) as count'))->groupBy('name');
+ $query = $this->tag->newQuery()
+ ->select('*', DB::raw('count(*) as count'))
+ ->groupBy('name');
 
  if ($searchTerm) {
  $query = $query->where('name', 'LIKE', $searchTerm . '%')->orderBy('name', 'desc');
@@ -45,7 +47,9 @@ public function getNameSuggestions(?string $searchTerm): Collection
  */
  public function getValueSuggestions(?string $searchTerm, ?string $tagName): Collection
  {
- $query = $this->tag->select('*', DB::raw('count(*) as count'))->groupBy('value');
+ $query = $this->tag->newQuery()
+ ->select('*', DB::raw('count(*) as count'))
+ ->groupBy('value');
 
  if ($searchTerm) {
  $query = $query->where('value', 'LIKE', $searchTerm . '%')->orderBy('value', 'desc');

app/Actions/ViewService.php

@@ -65,7 +65,7 @@ public function getPopular(int $count = 10, int $page = 0, array $filterModels =
  {
  $skipCount = $count * $page;
  $query = $this->permissionService
- ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type', $action)
+ ->filterRestrictedEntityRelations($this->view->newQuery(), 'views', 'viewable_id', 'viewable_type', $action)
  ->select('*', 'viewable_id', 'viewable_type', DB::raw('SUM(views) as view_count'))
  ->groupBy('viewable_id', 'viewable_type')
  ->orderBy('view_count', 'desc');

app/Api/ApiDocsGenerator.php

@@ -142,5 +142,4 @@ protected function getFlatApiRoutes(): Collection
  ];
  });
  }
-
-}
+}

app/Api/ApiTokenGuard.php

@@ -163,4 +163,4 @@ public function logout()
  {
  $this->user = null;
  }
-}
+}