Skip to content

NOW MANAGED ON CODEBERG

Framework: Fixed issues breaking tests

Dan Brownd6b771798564
diff --git a/app/Translation/FileLoader.php b/app/Translation/FileLoader.php
index de1124046..1fec4d18b 100644
--- a/app/Translation/FileLoader.php
+++ b/app/Translation/FileLoader.php
@@ -8,16 +8,22 @@ class FileLoader extends BaseLoader
{
/**
* Load the messages for the given locale.
+ *
* Extends Laravel's translation FileLoader to look in multiple directories
* so that we can load in translation overrides from the theme file if wanted.
*
+ * Note: As of using Laravel 10, this may now be redundant since Laravel's
+ * file loader supports multiple paths. This needs further testing though
+ * to confirm if Laravel works how we expect, since we specifically need
+ * the theme folder to be able to partially override core lang files.
+ *
* @param string $locale
* @param string $group
* @param string|null $namespace
*
* @return array
*/
- public function load($locale, $group, $namespace = null)
+ public function load($locale, $group, $namespace = null): array
{
if ($group === '*' && $namespace === '*') {
return $this->loadJsonPaths($locale);
@@ -25,8 +31,8 @@ class FileLoader extends BaseLoader
if (is_null($namespace) || $namespace === '*') {
$themePath = theme_path('lang');
- $themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
- $originalTranslations = $this->loadPath($this->path, $locale, $group);
+ $themeTranslations = $themePath ? $this->loadPaths([$themePath], $locale, $group) : [];
+ $originalTranslations = $this->loadPaths($this->paths, $locale, $group);
return array_merge($originalTranslations, $themeTranslations);
}
diff --git a/tests/Auth/ResetPasswordTest.php b/tests/Auth/ResetPasswordTest.php
index e60ac5643..d2af17b9c 100644
--- a/tests/Auth/ResetPasswordTest.php
+++ b/tests/Auth/ResetPasswordTest.php
@@ -95,7 +95,7 @@ class ResetPasswordTest extends TestCase
$resp = $this->followingRedirects()->post('/password/email', [
'email' => $editor->email,
]);
- Notification::assertTimesSent(1, ResetPasswordNotification::class);
+ Notification::assertSentTimes(ResetPasswordNotification::class, 1);
$resp->assertSee('A password reset link will be sent to ' . $editor->email . ' if that email address is found in the system.');
}
}