From c116275f687ad95db1a2ba6410b53fd6699c5a1c Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Fri, 17 Jan 2025 19:42:03 +0100 Subject: [PATCH] fix: failing tests & lint. --- library/App.php | 11 +++--- library/Helper/SiteSwitcher/SiteSwitcher.php | 2 +- library/Helper/User/User.php | 38 ++++++++++---------- library/Helper/User/User.test.php | 17 ++++++--- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/library/App.php b/library/App.php index 94848a5b6..24e3a41ca 100644 --- a/library/App.php +++ b/library/App.php @@ -59,7 +59,6 @@ use Municipio\Helper\User\User; use Municipio\Helper\SiteSwitcher\SiteSwitcher; - /** * Class App * @package Municipio @@ -98,12 +97,12 @@ public function __construct( $userGroupConfig = new \Municipio\UserGroup\Config\UserGroupConfig($this->wpService); $userHelperConfig = new \Municipio\Helper\User\Config\UserConfig(); $userHelper = new \Municipio\Helper\User\User( - $this->wpService, - $this->acfService, - $userHelperConfig, - $userGroupConfig, + $this->wpService, + $this->acfService, + $userHelperConfig, + $userGroupConfig, new \Municipio\Helper\Term\Term($this->wpService, $this->acfService), - new \Municipio\Helper\SiteSwitcher\SiteSwitcher() + new \Municipio\Helper\SiteSwitcher\SiteSwitcher() ); /** diff --git a/library/Helper/SiteSwitcher/SiteSwitcher.php b/library/Helper/SiteSwitcher/SiteSwitcher.php index 685533d66..6f147439b 100644 --- a/library/Helper/SiteSwitcher/SiteSwitcher.php +++ b/library/Helper/SiteSwitcher/SiteSwitcher.php @@ -22,4 +22,4 @@ public function runInSite(int $siteId, callable $callable, mixed $callableContex restore_current_blog(); } } -} \ No newline at end of file +} diff --git a/library/Helper/User/User.php b/library/Helper/User/User.php index d0b0f5f63..179a49cdb 100644 --- a/library/Helper/User/User.php +++ b/library/Helper/User/User.php @@ -101,10 +101,10 @@ public function getUserGroup(null|\WP_User|int $user = null): ?WP_Term } $userGroup = $this->siteSwitcher->runInSite( - $this->wpService->getMainSiteId(), - function() use ($user) { + $this->wpService->getMainSiteId(), + function () use ($user) { return $this->wpService->wpGetObjectTerms( - $user->ID, + $user->ID, $this->userGroupConfig->getUserGroupTaxonomy() ); } @@ -145,18 +145,18 @@ public function getUserGroupUrl(?WP_Term $term = null, null|WP_User|int $user = // Initialize the URL resolver $urlResolver = new UserGroupUrl( - $typeOfLink, - $term, - $this->acfService, - $this->wpService, - $this->userConfig, + $typeOfLink, + $term, + $this->acfService, + $this->wpService, + $this->userConfig, $this->userGroupConfig ); // Resolve the URL $resolvedUrl = $this->siteSwitcher->runInSite( - $this->wpService->getMainSiteId(), - function() use ($urlResolver) { + $this->wpService->getMainSiteId(), + function () use ($urlResolver) { return $urlResolver->get(); } ); @@ -173,8 +173,8 @@ public function getUserGroupUrlType(?WP_Term $term = null, null|WP_User|int $use $termId = $this->userGroupConfig->getUserGroupTaxonomy($user) . '_' . $term->term_id; $userGroupUrlType = $this->siteSwitcher->runInSite( - $this->wpService->getMainSiteId(), - function() use ($termId) { + $this->wpService->getMainSiteId(), + function () use ($termId) { return $this->acfService->getField('user_group_type_of_link', $termId) ?: null; } ); @@ -194,11 +194,11 @@ public function getUserPrefersGroupUrl(null|WP_User|int $user = null): ?bool } $perfersGroupUrl = $this->siteSwitcher->runInSite( - $this->wpService->getMainSiteId(), - function() use ($user) { + $this->wpService->getMainSiteId(), + function () use ($user) { return $this->wpService->getUserMeta( - $user->ID, - $this->userConfig->getUserPrefersGroupUrlMetaKey(), + $user->ID, + $this->userConfig->getUserPrefersGroupUrlMetaKey(), true ); } @@ -248,12 +248,12 @@ public function setUserGroup(string $groupName, null|WP_User|int $user = null): $taxonomy = $this->userGroupConfig->getUserGroupTaxonomy(); $this->siteSwitcher->runInSite( - $this->wpService->getMainSiteId(), - function() use ($groupName, $taxonomy, $user) { + $this->wpService->getMainSiteId(), + function () use ($groupName, $taxonomy, $user) { if ($termId = $this->termHelper->createOrGetTermIdFromString($groupName, $taxonomy)) { $this->wpService->wpSetObjectTerms($user->ID, $termId, $taxonomy, false); } } ); } -} \ No newline at end of file +} diff --git a/library/Helper/User/User.test.php b/library/Helper/User/User.test.php index 7c0393ef8..271a05a42 100644 --- a/library/Helper/User/User.test.php +++ b/library/Helper/User/User.test.php @@ -5,6 +5,7 @@ use AcfService\Implementations\FakeAcfService; use Municipio\Helper\Term\Contracts\CreateOrGetTermIdFromString; use Municipio\Helper\User\Config\UserConfigInterface; +use Municipio\Helper\SiteSwitcher\SiteSwitcher; use Municipio\TestUtils\WpMockFactory; use Municipio\UserGroup\Config\UserGroupConfigInterface; use PHPUnit\Framework\TestCase; @@ -22,7 +23,8 @@ public function testCanBeInstantiated() new FakeAcfService(), $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), - $this->createStub(CreateOrGetTermIdFromString::class) + $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $this->assertInstanceOf(User::class, $user); @@ -38,7 +40,8 @@ public function testGetUserReturnsSameUserAsProvidedIfUserOfTypeWPUserIsProvided new FakeAcfService(), $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), - $this->createStub(CreateOrGetTermIdFromString::class) + $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $wpUser = WpMockFactory::createWpUser(['ID' => 1]); @@ -56,7 +59,8 @@ public function testGetUserReturnsNullIfUserOfTypeWPUserIsProvidedAndIdIs0() new FakeAcfService(), $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), - $this->createStub(CreateOrGetTermIdFromString::class) + $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $wpUser = WpMockFactory::createWpUser(['ID' => 0]); @@ -76,7 +80,8 @@ public function testGetUserReturnsCurrentUserIfNoUserIsProvidedAndUserIsLoggedIn new FakeAcfService(), $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), - $this->createStub(CreateOrGetTermIdFromString::class) + $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $this->assertEquals(123, $user->getUser()->ID); @@ -96,7 +101,8 @@ public function testGetUserReturnsUserFromDbIfUserIdIsProvidedAndUserExists() new FakeAcfService(), $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), - $this->createStub(CreateOrGetTermIdFromString::class) + $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $this->assertEquals(123, $user->getUser(123)->ID); @@ -117,6 +123,7 @@ public function testGetUserReturnsNullIfUserIdIsProvidedAndUserDoesNotExist() $this->createStub(UserConfigInterface::class), $this->createStub(UserGroupConfigInterface::class), $this->createStub(CreateOrGetTermIdFromString::class), + $this->createStub(SiteSwitcher::class) ); $this->assertNull($user->getUser(123));