]>
BookStack Code Mirror - bookstack/commitdiff
projects
/
bookstack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
f63d7f6
)
Updated translators and merged styleci fixes
author
Dan Brown
<redacted>
Tue, 23 Nov 2021 20:41:12 +0000
(20:41 +0000)
committer
Dan Brown
<redacted>
Tue, 23 Nov 2021 20:41:12 +0000
(20:41 +0000)
.github/translators.txt
patch
|
blob
|
history
app/Entities/Models/Chapter.php
patch
|
blob
|
history
app/Theming/ThemeService.php
patch
|
blob
|
history
tests/Unit/FrameworkAssumptionTest.php
patch
|
blob
|
history
diff --git
a/.github/translators.txt
b/.github/translators.txt
index 57a8714f4fe5989a375461111b51dd6e956fd6fa..8d9601e72a2df8588a0b7effc90f88bf1e61303e 100644
(file)
--- a/
.github/translators.txt
+++ b/
.github/translators.txt
@@
-199,3
+199,4
@@
M Nafis Al Mukhdi (mnafisalmukhdi1) :: Indonesian
sulfo :: Danish
Raukze :: German
zygimantus :: Lithuanian
+marinkaberg :: Russian
diff --git
a/app/Entities/Models/Chapter.php
b/app/Entities/Models/Chapter.php
index 8fc2d333dbe43a99321414fb983b185070071c46..08d6608a9e4a5fc77578f50db98100cec91f659f 100644
(file)
--- a/
app/Entities/Models/Chapter.php
+++ b/
app/Entities/Models/Chapter.php
@@
-23,6
+23,7
@@
class Chapter extends BookChild
/**
* Get the pages that this chapter contains.
+ *
* @return HasMany<Page>
*/
public function pages(string $dir = 'ASC'): HasMany
diff --git
a/app/Theming/ThemeService.php
b/app/Theming/ThemeService.php
index 57336ec5f71d21a3156aa69120fb194d76104a2e..275dc9d8c94d421fa4af8467e98146e73fa4404b 100644
(file)
--- a/
app/Theming/ThemeService.php
+++ b/
app/Theming/ThemeService.php
@@
-5,7
+5,6
@@
namespace BookStack\Theming;
use BookStack\Auth\Access\SocialAuthService;
use Illuminate\Console\Application;
use Illuminate\Console\Application as Artisan;
-use Illuminate\Contracts\Console\Kernel;
use Symfony\Component\Console\Command\Command;
class ThemeService
diff --git
a/tests/Unit/FrameworkAssumptionTest.php
b/tests/Unit/FrameworkAssumptionTest.php
index 8ad45612cdfd0ea4673865843886d6f29e53c56b..54d315de94054c2765fa559b3e258a7adb4442c9 100644
(file)
--- a/
tests/Unit/FrameworkAssumptionTest.php
+++ b/
tests/Unit/FrameworkAssumptionTest.php
@@
-13,7
+13,6
@@
use Tests\TestCase;
*/
class FrameworkAssumptionTest extends TestCase
{
-
public function test_scopes_error_if_not_existing()
{
$this->expectException(BadMethodCallException::class);