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

Applied StyleCi changes, updated php deps

Browse Source
This commit is contained in:
Dan Brown 2022-08-29 17:46:41 +01:00
parent e537d0c4e8
commit 1cc7c649dc
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
26 changed files with 435 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Auth/Access/Oidc/OidcOAuthProvider.php
View File

@ -31,7 +31,7 @@ class OidcOAuthProvider extends AbstractProvider
protected $tokenEndpoint;
/**
* Scopes to use for the OIDC authorization call
* Scopes to use for the OIDC authorization call.
*/
protected array $scopes = ['openid', 'profile', 'email'];

11
app/Auth/Access/Oidc/OidcService.php
View File

@ -2,9 +2,8 @@
namespace BookStack\Auth\Access\Oidc;
use BookStack\Auth\Access\GroupSyncService;
use Illuminate\Support\Arr;
use function auth;
use BookStack\Auth\Access\GroupSyncService;
use BookStack\Auth\Access\LoginService;
use BookStack\Auth\Access\RegistrationService;
use BookStack\Auth\User;
@ -12,6 +11,7 @@ use BookStack\Exceptions\JsonDebugException;
use BookStack\Exceptions\StoppedAuthenticationException;
use BookStack\Exceptions\UserRegistrationException;
use function config;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Cache;
use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
@ -38,8 +38,7 @@ class OidcService
LoginService $loginService,
HttpClient $httpClient,
GroupSyncService $groupService
)
{
) {
$this->registrationService = $registrationService;
$this->loginService = $loginService;
$this->httpClient = $httpClient;
@ -148,7 +147,7 @@ class OidcService
$scopeConfig = $this->config()['additional_scopes'] ?: '';
$scopeArr = explode(',', $scopeConfig);
$scopeArr = array_map(fn(string $scope) => trim($scope), $scopeArr);
$scopeArr = array_map(fn (string $scope) => trim($scope), $scopeArr);
return array_filter($scopeArr);
}
@ -192,7 +191,7 @@ class OidcService
return [];
}
return array_values(array_filter($groupsList, function($val) {
return array_values(array_filter($groupsList, function ($val) {
return is_string($val);
}));
}

1
app/Console/Commands/RegenerateCommentContent.php
View File

@ -58,6 +58,7 @@ class RegenerateCommentContent extends Command
DB::setDefaultConnection($connection);
$this->comment('Comment HTML content has been regenerated');
return 0;
}
}

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

@ -50,6 +50,7 @@ class RegeneratePermissions extends Command
DB::setDefaultConnection($connection);
$this->comment('Permissions regenerated');
return 0;
}
}

1
app/Console/Commands/RegenerateReferences.php
View File

@ -53,6 +53,7 @@ class RegenerateReferences extends Command
DB::setDefaultConnection($connection);
$this->comment('References have been regenerated');
return 0;
}
}

3
app/Entities/Repos/PageRepo.php
View File

@ -36,8 +36,7 @@ class PageRepo
RevisionRepo $revisionRepo,
ReferenceStore $referenceStore,
ReferenceUpdater $referenceUpdater
)
{
) {
$this->baseRepo = $baseRepo;
$this->revisionRepo = $revisionRepo;
$this->referenceStore = $referenceStore;

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

@ -23,7 +23,6 @@ class ChapterController extends Controller
protected ChapterRepo $chapterRepo;
protected ReferenceFetcher $referenceFetcher;
public function __construct(ChapterRepo $chapterRepo, ReferenceFetcher $referenceFetcher)
{
$this->chapterRepo = $chapterRepo;

1
app/References/CrossLinkParser.php
View File

@ -99,5 +99,4 @@ class CrossLinkParser
new BookshelfLinkModelResolver(),
]);
}
}

1
app/References/Reference.php
View File

@ -2,7 +2,6 @@
namespace BookStack\References;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;

6
app/References/ReferenceFetcher.php
View File

@ -26,9 +26,9 @@ class ReferenceFetcher
$baseQuery = $entity->referencesTo()
->where('from_type', '=', (new Page())->getMorphClass())
->with([
'from' => fn(Relation $query) => $query->select(Page::$listAttributes),
'from.book' => fn(Relation $query) => $query->scopes('visible'),
'from.chapter' => fn(Relation $query) => $query->scopes('visible')
'from' => fn (Relation $query) => $query->select(Page::$listAttributes),
'from.book' => fn (Relation $query) => $query->scopes('visible'),
'from.chapter' => fn (Relation $query) => $query->scopes('visible'),
]);
$references = $this->permissions->restrictEntityRelationQuery(

6
app/References/ReferenceStore.php
View File

@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Collection;
class ReferenceStore
{
/**
* Update the outgoing references for the given page.
*/
@ -25,7 +24,7 @@ class ReferenceStore
->where('from_type', '=', (new Page())->getMorphClass())
->delete();
Page::query()->select(['id', 'html'])->chunk(100, function(Collection $pages) {
Page::query()->select(['id', 'html'])->chunk(100, function (Collection $pages) {
$this->updateForPages($pages->all());
});
}
@ -44,7 +43,7 @@ class ReferenceStore
$parser = CrossLinkParser::createWithEntityResolvers();
$references = [];
$pageIds = array_map(fn(Page $page) => $page->id, $pages);
$pageIds = array_map(fn (Page $page) => $page->id, $pages);
Reference::query()
->where('from_type', '=', $pages[0]->getMorphClass())
->whereIn('from_id', $pageIds)
@ -67,5 +66,4 @@ class ReferenceStore
Reference::query()->insert($referenceDataChunk);
}
}
}

821
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

10
tests/Auth/OidcTest.php
View File

@ -374,7 +374,7 @@ class OidcTest extends TestCase
$resp = $this->runLogin([
'email' => 'benny@example.com',
'sub' => 'benny1010101',
'groups' => ['Wizards', 'Zookeepers']
'groups' => ['Wizards', 'Zookeepers'],
]);
$resp->assertRedirect('/');
@ -401,10 +401,10 @@ class OidcTest extends TestCase
'my' => [
'custom' => [
'groups' => [
'attr' => ['Wizards']
]
]
]
'attr' => ['Wizards'],
],
],
],
]);
$resp->assertRedirect('/');

4
tests/References/CrossLinkParserTest.php
View File

@ -2,14 +2,12 @@
namespace Tests\References;
use BookStack\Entities\Models\Book;
use BookStack\Entities\Models\Page;
use BookStack\References\CrossLinkParser;
use Tests\TestCase;
class CrossLinkParserTest extends TestCase
{
public function test_instance_with_entity_resolvers_matches_entity_links()
{
$entities = $this->getEachEntityType();
@ -17,7 +15,7 @@ class CrossLinkParserTest extends TestCase
$html = '
<a href="' . url('/link/' . $otherPage->id) . '#cat">Page Permalink</a>
<a href="' . $entities['page'] ->getUrl(). '?a=b">Page Link</a>
<a href="' . $entities['page']->getUrl() . '?a=b">Page Link</a>
<a href="' . $entities['chapter']->getUrl() . '?cat=mouse#donkey">Chapter Link</a>
<a href="' . $entities['book']->getUrl() . '/edit">Book Link</a>
<a href="' . $entities['bookshelf']->getUrl() . '/edit?cat=happy#hello">Shelf Link</a>

6
tests/References/ReferencesTest.php
View File

@ -12,7 +12,6 @@ use Tests\TestCase;
class ReferencesTest extends TestCase
{
public function test_references_created_on_page_update()
{
/** @var Page $pageA */
@ -24,7 +23,7 @@ class ReferencesTest extends TestCase
$this->asEditor()->put($pageA->getUrl(), [
'name' => 'Reference test',
'html' => '<a href="' . $pageB->getUrl() . '">Testing</a>'
'html' => '<a href="' . $pageB->getUrl() . '">Testing</a>',
]);
$this->assertDatabaseHas('references', [
@ -141,7 +140,7 @@ class ReferencesTest extends TestCase
$this->assertStringContainsString('href="http://localhost/books/my-updated-book-slugaroo"', $page->html);
$this->assertDatabaseHas('page_revisions', [
'page_id' => $page->id,
'summary' => 'System auto-update of internal links'
'summary' => 'System auto-update of internal links',
]);
}
}
@ -184,5 +183,4 @@ class ReferencesTest extends TestCase
'to_id' => $to->id,
])->save();
}
}