diff options
Diffstat (limited to 'tests/app/Http')
45 files changed, 102 insertions, 102 deletions
diff --git a/tests/app/Http/Middleware/AuthAdministratorTest.php b/tests/app/Http/Middleware/AuthAdministratorTest.php index dddbff9d54..439f39aba9 100644 --- a/tests/app/Http/Middleware/AuthAdministratorTest.php +++ b/tests/app/Http/Middleware/AuthAdministratorTest.php @@ -41,10 +41,10 @@ class AuthAdministratorTest extends TestCase */ public function testAllowed(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('1'); $request = self::createRequest()->withAttribute('user', $user); @@ -63,10 +63,10 @@ class AuthAdministratorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); $request = self::createRequest()->withAttribute('user', $user); @@ -80,7 +80,7 @@ class AuthAdministratorTest extends TestCase */ public function testNotLoggedIn(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); $request = self::createRequest()->withAttribute('user', new GuestUser()); diff --git a/tests/app/Http/Middleware/AuthEditorTest.php b/tests/app/Http/Middleware/AuthEditorTest.php index df3fcbd6ff..e468b68603 100644 --- a/tests/app/Http/Middleware/AuthEditorTest.php +++ b/tests/app/Http/Middleware/AuthEditorTest.php @@ -42,13 +42,13 @@ class AuthEditorTest extends TestCase */ public function testAllowed(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -67,13 +67,13 @@ class AuthEditorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -87,10 +87,10 @@ class AuthEditorTest extends TestCase */ public function testNotLoggedIn(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthEditor(); diff --git a/tests/app/Http/Middleware/AuthManagerTest.php b/tests/app/Http/Middleware/AuthManagerTest.php index 257711da3f..052c0182a1 100644 --- a/tests/app/Http/Middleware/AuthManagerTest.php +++ b/tests/app/Http/Middleware/AuthManagerTest.php @@ -42,13 +42,13 @@ class AuthManagerTest extends TestCase */ public function testAllowed(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MANAGER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -67,13 +67,13 @@ class AuthManagerTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -87,10 +87,10 @@ class AuthManagerTest extends TestCase */ public function testNotLoggedIn(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthManager(); diff --git a/tests/app/Http/Middleware/AuthMemberTest.php b/tests/app/Http/Middleware/AuthMemberTest.php index 5b886f1b08..cce0fdf932 100644 --- a/tests/app/Http/Middleware/AuthMemberTest.php +++ b/tests/app/Http/Middleware/AuthMemberTest.php @@ -42,13 +42,13 @@ class AuthMemberTest extends TestCase */ public function testAllowed(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -67,13 +67,13 @@ class AuthMemberTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(''); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -87,10 +87,10 @@ class AuthMemberTest extends TestCase */ public function testNotLoggedIn(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthMember(); diff --git a/tests/app/Http/Middleware/AuthModeratorTest.php b/tests/app/Http/Middleware/AuthModeratorTest.php index 3498f16a01..915c1bd42a 100644 --- a/tests/app/Http/Middleware/AuthModeratorTest.php +++ b/tests/app/Http/Middleware/AuthModeratorTest.php @@ -42,13 +42,13 @@ class AuthModeratorTest extends TestCase */ public function testAllowed(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -67,13 +67,13 @@ class AuthModeratorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -87,10 +87,10 @@ class AuthModeratorTest extends TestCase */ public function testNotLoggedIn(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthModerator(); diff --git a/tests/app/Http/Middleware/BootModulesTest.php b/tests/app/Http/Middleware/BootModulesTest.php index 0287aa4b82..4230975cdf 100644 --- a/tests/app/Http/Middleware/BootModulesTest.php +++ b/tests/app/Http/Middleware/BootModulesTest.php @@ -41,10 +41,10 @@ class BootModulesTest extends TestCase { $theme = new WebtreesTheme(); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('It works!')); - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service ->expects(self::once()) ->method('bootModules') diff --git a/tests/app/Http/Middleware/CheckCsrfTest.php b/tests/app/Http/Middleware/CheckCsrfTest.php index 24395532c7..a3cd2eb3fb 100644 --- a/tests/app/Http/Middleware/CheckCsrfTest.php +++ b/tests/app/Http/Middleware/CheckCsrfTest.php @@ -40,7 +40,7 @@ class CheckCsrfTest extends TestCase */ public function testMiddleware(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $request = self::createRequest(RequestMethodInterface::METHOD_POST) diff --git a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php index 4342317c7b..79d61953ea 100644 --- a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php +++ b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php @@ -37,7 +37,7 @@ class CheckForMaintenanceModeTest extends TestCase */ public function testMiddleware(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $request = self::createRequest(); diff --git a/tests/app/Http/Middleware/DoHousekeepingTest.php b/tests/app/Http/Middleware/DoHousekeepingTest.php index 542fbb63b8..2ee97bd833 100644 --- a/tests/app/Http/Middleware/DoHousekeepingTest.php +++ b/tests/app/Http/Middleware/DoHousekeepingTest.php @@ -38,7 +38,7 @@ class DoHousekeepingTest extends TestCase */ public function testMiddleware(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $request = self::createRequest(); diff --git a/tests/app/Http/Middleware/HandleExceptionsTest.php b/tests/app/Http/Middleware/HandleExceptionsTest.php index fefb139cb1..8ee4023615 100644 --- a/tests/app/Http/Middleware/HandleExceptionsTest.php +++ b/tests/app/Http/Middleware/HandleExceptionsTest.php @@ -42,12 +42,12 @@ class HandleExceptionsTest extends TestCase */ public function testMiddleware(): void { - $tree_service = self::createMock(TreeService::class); + $tree_service = $this->createMock(TreeService::class); - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willThrowException(new HttpServerErrorException('eek')); - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service->method('findByInterface')->willReturn(new Collection()); $module_service->method('findByComponent')->willReturn(new Collection()); app()->instance(ModuleService::class, $module_service); diff --git a/tests/app/Http/Middleware/NoRouteFoundTest.php b/tests/app/Http/Middleware/NoRouteFoundTest.php index 7a2d9abe3d..ed1aee72e2 100644 --- a/tests/app/Http/Middleware/NoRouteFoundTest.php +++ b/tests/app/Http/Middleware/NoRouteFoundTest.php @@ -37,7 +37,7 @@ class NoRouteFoundTest extends TestCase */ public function testMiddleware(): void { - $handler = self::createMock(RequestHandlerInterface::class); + $handler = $this->createMock(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $request = self::createRequest(); diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php index e0c5d3fda3..7fb73b14bf 100644 --- a/tests/app/Http/RequestHandlers/AccountDeleteTest.php +++ b/tests/app/Http/RequestHandlers/AccountDeleteTest.php @@ -36,7 +36,7 @@ class AccountDeleteTest extends TestCase */ public function testHandler(): void { - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $handler = new AccountDelete($user_service); $request = self::createRequest(); $response = $handler->handle($request); diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php index 53d70395ba..1a0e13c078 100644 --- a/tests/app/Http/RequestHandlers/AccountEditTest.php +++ b/tests/app/Http/RequestHandlers/AccountEditTest.php @@ -35,14 +35,14 @@ use Fisharebest\Webtrees\User; */ class AccountEditTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void */ public function testHandler(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $handler = new AccountEdit(new MessageService(new EmailService(), new UserService()), new ModuleService()); $request = self::createRequest() ->withAttribute('user', $user); diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php index ea96f038f2..7d6b3df439 100644 --- a/tests/app/Http/RequestHandlers/AccountUpdateTest.php +++ b/tests/app/Http/RequestHandlers/AccountUpdateTest.php @@ -39,9 +39,9 @@ class AccountUpdateTest extends TestCase */ public function testHandler(): void { - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->expects(self::once())->method('setEmail')->with('b'); $user->expects(self::once())->method('setPassword')->with('e'); $user->expects(self::once())->method('setRealName')->with('d'); @@ -55,7 +55,7 @@ class AccountUpdateTest extends TestCase [UserInterface::PREF_IS_VISIBLE_ONLINE, 'i'] ); - $tree = self::createMock(Tree::class); + $tree = $this->createMock(Tree::class); $tree->expects(self::once())->method('setUserPreference')->with($user, UserInterface::PREF_TREE_DEFAULT_XREF, 'f'); $handler = new AccountUpdate($user_service); diff --git a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php index e852a5a364..c151cf586c 100644 --- a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php +++ b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php @@ -38,7 +38,7 @@ use Fisharebest\Webtrees\TestCase; */ class ControlPanelControllerTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/DataFixDataTest.php b/tests/app/Http/RequestHandlers/DataFixDataTest.php index 23273646fa..af24f8694c 100644 --- a/tests/app/Http/RequestHandlers/DataFixDataTest.php +++ b/tests/app/Http/RequestHandlers/DataFixDataTest.php @@ -36,7 +36,7 @@ use Fisharebest\Webtrees\Services\TreeService; */ class DataFixDataTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * Test request handler diff --git a/tests/app/Http/RequestHandlers/DeleteUserTest.php b/tests/app/Http/RequestHandlers/DeleteUserTest.php index 24592874fe..03404b6b09 100644 --- a/tests/app/Http/RequestHandlers/DeleteUserTest.php +++ b/tests/app/Http/RequestHandlers/DeleteUserTest.php @@ -32,17 +32,17 @@ use Fisharebest\Webtrees\User; */ class DeleteUserTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void */ public function testDeleteUser(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('id')->willReturn(1); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() @@ -61,7 +61,7 @@ class DeleteUserTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('User ID 98765 not found'); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn(null); $request = self::createRequest() @@ -78,11 +78,11 @@ class DeleteUserTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('Cannot delete an administrator'); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('id')->willReturn(1); $user->expects(self::once())->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('1'); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() diff --git a/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php b/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php index 06abcaba78..6ea1e73d1c 100644 --- a/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php +++ b/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php @@ -31,7 +31,7 @@ use Fisharebest\Webtrees\TestCase; */ class FixLevel0MediaActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php b/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php index 687f778145..ac2047c7bd 100644 --- a/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php +++ b/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php @@ -32,7 +32,7 @@ use Fisharebest\Webtrees\TestCase; */ class FixLevel0MediaDataTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php b/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php index 3942c33abb..05058e594b 100644 --- a/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php +++ b/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php @@ -31,7 +31,7 @@ use Fisharebest\Webtrees\TestCase; */ class ImportThumbnailsActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php b/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php index 909874658d..85fbdef89d 100644 --- a/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php +++ b/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php @@ -31,7 +31,7 @@ use Fisharebest\Webtrees\TestCase; */ class ImportThumbnailsDataTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/ImportThumbnailsPageTest.php b/tests/app/Http/RequestHandlers/ImportThumbnailsPageTest.php index 022b86a643..c4e211b96f 100644 --- a/tests/app/Http/RequestHandlers/ImportThumbnailsPageTest.php +++ b/tests/app/Http/RequestHandlers/ImportThumbnailsPageTest.php @@ -29,7 +29,7 @@ use Fisharebest\Webtrees\TestCase; */ class ImportThumbnailsPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php index d25307c9ca..e1c5d270cb 100644 --- a/tests/app/Http/RequestHandlers/LoginPageTest.php +++ b/tests/app/Http/RequestHandlers/LoginPageTest.php @@ -48,7 +48,7 @@ class LoginPageTest extends TestCase public function testLoginPageAlreadyLoggedIn(): void { $tree_service = new TreeService(); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $request = self::createRequest()->withAttribute('user', $user); $handler = new LoginPage($tree_service); $response = $handler->handle($request); diff --git a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php index e4d3ba7122..b87ac03c34 100644 --- a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php +++ b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php @@ -34,7 +34,7 @@ use League\Flysystem\InMemory\InMemoryFilesystemAdapter; */ class ManageMediaDataTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/ManageMediaPageTest.php b/tests/app/Http/RequestHandlers/ManageMediaPageTest.php index fe377c8856..8f3b28fe92 100644 --- a/tests/app/Http/RequestHandlers/ManageMediaPageTest.php +++ b/tests/app/Http/RequestHandlers/ManageMediaPageTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class ManageMediaPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/MapDataExportCSVTest.php b/tests/app/Http/RequestHandlers/MapDataExportCSVTest.php index a4186a44dc..50761e0628 100644 --- a/tests/app/Http/RequestHandlers/MapDataExportCSVTest.php +++ b/tests/app/Http/RequestHandlers/MapDataExportCSVTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class MapDataExportCSVTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/MapDataExportGeoJsonTest.php b/tests/app/Http/RequestHandlers/MapDataExportGeoJsonTest.php index b2f97daab1..321eb1449e 100644 --- a/tests/app/Http/RequestHandlers/MapDataExportGeoJsonTest.php +++ b/tests/app/Http/RequestHandlers/MapDataExportGeoJsonTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class MapDataExportGeoJsonTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/MapDataImportActionTest.php b/tests/app/Http/RequestHandlers/MapDataImportActionTest.php index 48a889b165..936bc8691f 100644 --- a/tests/app/Http/RequestHandlers/MapDataImportActionTest.php +++ b/tests/app/Http/RequestHandlers/MapDataImportActionTest.php @@ -33,7 +33,7 @@ use function dirname; */ class MapDataImportActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/MapDataImportPageTest.php b/tests/app/Http/RequestHandlers/MapDataImportPageTest.php index c8c9972076..88006feffd 100644 --- a/tests/app/Http/RequestHandlers/MapDataImportPageTest.php +++ b/tests/app/Http/RequestHandlers/MapDataImportPageTest.php @@ -29,7 +29,7 @@ use Fisharebest\Webtrees\TestCase; */ class MapDataImportPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/MasqueradeTest.php b/tests/app/Http/RequestHandlers/MasqueradeTest.php index 4b58dbfa8e..8b4aee7760 100644 --- a/tests/app/Http/RequestHandlers/MasqueradeTest.php +++ b/tests/app/Http/RequestHandlers/MasqueradeTest.php @@ -37,13 +37,13 @@ class MasqueradeTest extends TestCase */ public function testMasqueradeAsUser(): void { - $user1 = self::createMock(User::class); + $user1 = $this->createMock(User::class); $user1->method('id')->willReturn(1); - $user2 = self::createMock(User::class); + $user2 = $this->createMock(User::class); $user2->method('id')->willReturn(2); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn($user2); $request = self::createRequest() @@ -63,10 +63,10 @@ class MasqueradeTest extends TestCase */ public function testCannotMasqueradeAsSelf(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('id')->willReturn(1); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn($user); $request = self::createRequest() @@ -88,10 +88,10 @@ class MasqueradeTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('User ID 2 not found'); - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->method('id')->willReturn(1); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service->expects(self::once())->method('find')->willReturn(null); $request = self::createRequest() diff --git a/tests/app/Http/RequestHandlers/ModuleActionTest.php b/tests/app/Http/RequestHandlers/ModuleActionTest.php index f30b7efa0e..891c3a5ea3 100644 --- a/tests/app/Http/RequestHandlers/ModuleActionTest.php +++ b/tests/app/Http/RequestHandlers/ModuleActionTest.php @@ -41,7 +41,7 @@ class ModuleActionTest extends TestCase */ public function testModuleAction(): void { - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service ->expects(self::once()) ->method('findByName') @@ -68,7 +68,7 @@ class ModuleActionTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('Method getTestingAction() not found in test'); - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service ->expects(self::once()) ->method('findByName') @@ -92,7 +92,7 @@ class ModuleActionTest extends TestCase $this->expectException(HttpNotFoundException::class); $this->expectExceptionMessage('Module test does not exist'); - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service ->expects(self::once()) ->method('findByName') @@ -116,7 +116,7 @@ class ModuleActionTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('Admin only action'); - $module_service = self::createMock(ModuleService::class); + $module_service = $this->createMock(ModuleService::class); $module_service ->expects(self::once()) ->method('findByName') diff --git a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php index 9e52c06fbc..68dd5fe334 100644 --- a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php +++ b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php @@ -45,7 +45,7 @@ class PasswordRequestPageTest extends TestCase */ public function testPasswordRequestPageAlreadyLoggedIn(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $request = self::createRequest()->withAttribute('user', $user); $handler = new PasswordRequestPage(); $response = $handler->handle($request); diff --git a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php index a3c74e4bd0..6640edc849 100644 --- a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php +++ b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php @@ -35,9 +35,9 @@ class PasswordResetPageTest extends TestCase */ public function testPasswordResetPageWithValidToken(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service ->expects(self::once()) ->method('findByToken') @@ -57,7 +57,7 @@ class PasswordResetPageTest extends TestCase */ public function testPasswordResetPageWithoutValidToken(): void { - $user_service = self::createMock(UserService::class); + $user_service = $this->createMock(UserService::class); $user_service ->expects(self::once()) ->method('findByToken') diff --git a/tests/app/Http/RequestHandlers/PingTest.php b/tests/app/Http/RequestHandlers/PingTest.php index 5059887489..5095633f64 100644 --- a/tests/app/Http/RequestHandlers/PingTest.php +++ b/tests/app/Http/RequestHandlers/PingTest.php @@ -34,7 +34,7 @@ class PingTest extends TestCase */ public function testPingOK(): void { - $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service = $this->createMock(ServerCheckService::class); $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection()); $server_check_service->expects(self::once())->method('serverWarnings')->willReturn(new Collection()); @@ -51,7 +51,7 @@ class PingTest extends TestCase */ public function testPingWarnings(): void { - $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service = $this->createMock(ServerCheckService::class); $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection()); $server_check_service->expects(self::once())->method('serverWarnings')->willReturn(new Collection('warning')); @@ -68,7 +68,7 @@ class PingTest extends TestCase */ public function testPingErrors(): void { - $server_check_service = self::createMock(ServerCheckService::class); + $server_check_service = $this->createMock(ServerCheckService::class); $server_check_service->expects(self::once())->method('serverErrors')->willReturn(new Collection('error')); $request = self::createRequest(); diff --git a/tests/app/Http/RequestHandlers/SelectThemeTest.php b/tests/app/Http/RequestHandlers/SelectThemeTest.php index db95ef9fd2..37482cd24a 100644 --- a/tests/app/Http/RequestHandlers/SelectThemeTest.php +++ b/tests/app/Http/RequestHandlers/SelectThemeTest.php @@ -34,7 +34,7 @@ class SelectThemeTest extends TestCase */ public function testSelectThemeForGuest(): void { - $user = self::createMock(GuestUser::class); + $user = $this->createMock(GuestUser::class); $user->expects(self::once())->method('setPreference')->with('theme', 'FOO'); $request = self::createRequest() @@ -52,7 +52,7 @@ class SelectThemeTest extends TestCase */ public function testSelectThemeForUser(): void { - $user = self::createMock(User::class); + $user = $this->createMock(User::class); $user->expects(self::once())->method('setPreference')->with('theme', 'FOO'); $request = self::createRequest() diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php index 6538802ab3..6b365c0f42 100644 --- a/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php +++ b/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php @@ -32,7 +32,7 @@ use Fisharebest\Webtrees\TestCase; */ class UpgradeWizardPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php index 8e92d432af..7dcdeb4877 100644 --- a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php +++ b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php @@ -39,7 +39,7 @@ use Illuminate\Support\Collection; */ class UpgradeWizardStepTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UploadMediaActionTest.php b/tests/app/Http/RequestHandlers/UploadMediaActionTest.php index 33dd6a8a35..f1465557b8 100644 --- a/tests/app/Http/RequestHandlers/UploadMediaActionTest.php +++ b/tests/app/Http/RequestHandlers/UploadMediaActionTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class UploadMediaActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UploadMediaPageTest.php b/tests/app/Http/RequestHandlers/UploadMediaPageTest.php index 9d255efa72..c81ec37d8e 100644 --- a/tests/app/Http/RequestHandlers/UploadMediaPageTest.php +++ b/tests/app/Http/RequestHandlers/UploadMediaPageTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class UploadMediaPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserAddActionTest.php b/tests/app/Http/RequestHandlers/UserAddActionTest.php index 40e617a67d..8aa051270e 100644 --- a/tests/app/Http/RequestHandlers/UserAddActionTest.php +++ b/tests/app/Http/RequestHandlers/UserAddActionTest.php @@ -31,7 +31,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserAddActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserAddPageTest.php b/tests/app/Http/RequestHandlers/UserAddPageTest.php index 6601072d57..0e09b7550b 100644 --- a/tests/app/Http/RequestHandlers/UserAddPageTest.php +++ b/tests/app/Http/RequestHandlers/UserAddPageTest.php @@ -29,7 +29,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserAddPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserEditActionTest.php b/tests/app/Http/RequestHandlers/UserEditActionTest.php index 3fcc93d924..863cc25961 100644 --- a/tests/app/Http/RequestHandlers/UserEditActionTest.php +++ b/tests/app/Http/RequestHandlers/UserEditActionTest.php @@ -33,7 +33,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserEditActionTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserEditPageTest.php b/tests/app/Http/RequestHandlers/UserEditPageTest.php index 5fc0b5ed51..8e543e5655 100644 --- a/tests/app/Http/RequestHandlers/UserEditPageTest.php +++ b/tests/app/Http/RequestHandlers/UserEditPageTest.php @@ -35,7 +35,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserEditPageTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserListDataTest.php b/tests/app/Http/RequestHandlers/UserListDataTest.php index c54f974a10..9d6bada462 100644 --- a/tests/app/Http/RequestHandlers/UserListDataTest.php +++ b/tests/app/Http/RequestHandlers/UserListDataTest.php @@ -32,7 +32,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserListDataTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void diff --git a/tests/app/Http/RequestHandlers/UserListTest.php b/tests/app/Http/RequestHandlers/UserListTest.php index 8ca7d294f2..ce3c221000 100644 --- a/tests/app/Http/RequestHandlers/UserListTest.php +++ b/tests/app/Http/RequestHandlers/UserListTest.php @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\TestCase; */ class UserListTest extends TestCase { - protected static $uses_database = true; + protected static bool $uses_database = true; /** * @return void |