Skip to content

Commit 3e16a60

Browse files
g5botg5bot
committed
rename ModuleViewEnum to ModuleEnum
1 parent 57b9167 commit 3e16a60

File tree

84 files changed

+237
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+237
-258
lines changed

src/Component/Game/ModuleViewEnum.php renamed to src/Component/Game/ModuleEnum.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
use Stu\Module\Colony\Component\ColonyComponentEnum;
1010
use Stu\Module\Game\Component\GameComponentEnum;
1111

12-
//TODO rename to ModuleEnum
13-
enum ModuleViewEnum: string
12+
enum ModuleEnum: string
1413
{
1514
case INDEX = 'index';
1615
case GAME = 'game';

‎src/Component/Spacecraft/SpacecraftTypeEnum.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Stu\Component\Spacecraft;
66

77
use RuntimeException;
8-
use Stu\Component\Game\ModuleViewEnum;
8+
use Stu\Component\Game\ModuleEnum;
99
use Stu\Module\Message\Lib\PrivateMessageFolderTypeEnum;
1010
use Stu\Module\Spacecraft\View\ShowSpacecraft\ShowSpacecraft;
1111

@@ -33,11 +33,11 @@ public function getMessageFolderType(): PrivateMessageFolderTypeEnum
3333
};
3434
}
3535

36-
public function getModuleView(): ?ModuleViewEnum
36+
public function getModuleView(): ?ModuleEnum
3737
{
3838
return match ($this) {
39-
self::SHIP => ModuleViewEnum::SHIP,
40-
self::STATION => ModuleViewEnum::STATION,
39+
self::SHIP => ModuleEnum::SHIP,
40+
self::STATION => ModuleEnum::STATION,
4141
default => null
4242
};
4343
}

‎src/Lib/Component/ComponentEnumInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Stu\Lib\Component;
44

5-
use Stu\Component\Game\ModuleViewEnum;
5+
use Stu\Component\Game\ModuleEnum;
66

77
interface ComponentEnumInterface
88
{
9-
public function getModuleView(): ModuleViewEnum;
9+
public function getModuleView(): ModuleEnum;
1010

1111
public function getTemplate(): string;
1212

‎src/Lib/Component/ComponentLoader.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Override;
88
use RuntimeException;
99
use Stu\Component\Game\GameEnum;
10-
use Stu\Component\Game\ModuleViewEnum;
10+
use Stu\Component\Game\ModuleEnum;
1111
use Stu\Config\Init;
1212
use Stu\Lib\Component\ComponentInterface;
1313
use Stu\Module\Control\GameControllerInterface;
@@ -63,7 +63,7 @@ private function addExecuteJs(
6363
$game->addExecuteJS(sprintf(
6464
"updateComponent('%s', '/%s?%s=1&component=%s%s'%s);",
6565
$id,
66-
ModuleViewEnum::GAME->getPhpPage(),
66+
ModuleEnum::GAME->getPhpPage(),
6767
ShowComponent::VIEW_IDENTIFIER,
6868
$id,
6969
$componentUpdate->getComponentParameters() ?? '',

‎src/Module/Alliance/Action/DeleteAlliance/DeleteAlliance.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Override;
88
use Stu\Component\Alliance\AllianceEnum;
9-
use Stu\Component\Game\ModuleViewEnum;
9+
use Stu\Component\Game\ModuleEnum;
1010
use Stu\Exception\AccessViolation;
1111
use Stu\Module\Alliance\Lib\AllianceActionManagerInterface;
1212
use Stu\Module\Control\ActionControllerInterface;
@@ -34,7 +34,7 @@ public function handle(GameControllerInterface $game): void
3434
$alliance = $user->getAlliance();
3535
$allianceId = $alliance->getId();
3636

37-
$game->setView(ModuleViewEnum::ALLIANCE);
37+
$game->setView(ModuleEnum::ALLIANCE);
3838

3939
$jobFounder = $this->allianceJobRepository->getSingleResultByAllianceAndType(
4040
$allianceId,

‎src/Module/Alliance/Action/Leave/Leave.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Override;
88
use Stu\Component\Alliance\AllianceEnum;
9-
use Stu\Component\Game\ModuleViewEnum;
9+
use Stu\Component\Game\ModuleEnum;
1010
use Stu\Exception\AccessViolation;
1111
use Stu\Module\Control\ActionControllerInterface;
1212
use Stu\Module\Control\GameControllerInterface;
@@ -21,9 +21,7 @@ final class Leave implements ActionControllerInterface
2121
*/
2222
public const string ACTION_IDENTIFIER = 'B_LEAVE_ALLIANCE';
2323

24-
public function __construct(private AllianceJobRepositoryInterface $allianceJobRepository, private PrivateMessageSenderInterface $privateMessageSender, private UserRepositoryInterface $userRepository)
25-
{
26-
}
24+
public function __construct(private AllianceJobRepositoryInterface $allianceJobRepository, private PrivateMessageSenderInterface $privateMessageSender, private UserRepositoryInterface $userRepository) {}
2725

2826
#[Override]
2927
public function handle(GameControllerInterface $game): void
@@ -57,7 +55,7 @@ public function handle(GameControllerInterface $game): void
5755
$this->privateMessageSender->send($userId, $alliance->getSuccessor()->getUserId(), $text);
5856
}
5957

60-
$game->setView(ModuleViewEnum::ALLIANCE);
58+
$game->setView(ModuleEnum::ALLIANCE);
6159

6260
$game->addInformation(_('Du hast die Allianz verlassen'));
6361
}

‎src/Module/Alliance/Action/PromotePlayer/PromotePlayer.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Override;
88
use Stu\Component\Alliance\AllianceEnum;
9-
use Stu\Component\Game\ModuleViewEnum;
9+
use Stu\Component\Game\ModuleEnum;
1010
use Stu\Exception\AccessViolation;
1111
use Stu\Module\Alliance\Lib\AllianceActionManagerInterface;
1212
use Stu\Module\Alliance\View\Management\Management;
@@ -23,9 +23,7 @@ final class PromotePlayer implements ActionControllerInterface
2323
*/
2424
public const string ACTION_IDENTIFIER = 'B_PROMOTE_USER';
2525

26-
public function __construct(private PromotePlayerRequestInterface $promotePlayerRequest, private AllianceJobRepositoryInterface $allianceJobRepository, private AllianceActionManagerInterface $allianceActionManager, private PrivateMessageSenderInterface $privateMessageSender, private UserRepositoryInterface $userRepository)
27-
{
28-
}
26+
public function __construct(private PromotePlayerRequestInterface $promotePlayerRequest, private AllianceJobRepositoryInterface $allianceJobRepository, private AllianceActionManagerInterface $allianceActionManager, private PrivateMessageSenderInterface $privateMessageSender, private UserRepositoryInterface $userRepository) {}
2927

3028
#[Override]
3129
public function handle(GameControllerInterface $game): void
@@ -91,7 +89,7 @@ public function handle(GameControllerInterface $game): void
9189
_('Du wurdest zum neuen Präsidenten der Allianz %s ernannt'),
9290
$alliance->getName()
9391
);
94-
$view = ModuleViewEnum::ALLIANCE;
92+
$view = ModuleEnum::ALLIANCE;
9593
break;
9694
case AllianceEnum::ALLIANCE_JOBS_SUCCESSOR:
9795
if ($userId === $playerId) {

‎src/Module/Colony/Component/ColonyComponentEnum.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
namespace Stu\Module\Colony\Component;
66

77
use Override;
8-
use Stu\Component\Game\ModuleViewEnum;
8+
use Stu\Component\Game\ModuleEnum;
99
use Stu\Lib\Component\ComponentEnumInterface;
1010

1111
enum ColonyComponentEnum: string implements ComponentEnumInterface
1212
{
13-
// mainscreen
13+
// mainscreen
1414
case SHIELDING = 'SHIELDING';
1515
case EPS_BAR = 'EPS_BAR';
1616
case SURFACE = 'SURFACE';
@@ -36,9 +36,9 @@ enum ColonyComponentEnum: string implements ComponentEnumInterface
3636
case SHIP_RETROFIT = 'SHIP_RETROFIT';
3737

3838
#[Override]
39-
public function getModuleView(): ModuleViewEnum
39+
public function getModuleView(): ModuleEnum
4040
{
41-
return ModuleViewEnum::COLONY;
41+
return ModuleEnum::COLONY;
4242
}
4343

4444
#[Override]

‎src/Module/Colony/View/ShowColony/ShowColony.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Override;
88
use Stu\Component\Colony\ColonyMenuEnum;
9-
use Stu\Component\Game\ModuleViewEnum;
9+
use Stu\Component\Game\ModuleEnum;
1010
use Stu\Lib\Colony\PlanetFieldHostTypeEnum;
1111
use Stu\Module\Colony\Lib\ColonyLoaderInterface;
1212
use Stu\Module\Colony\Lib\Gui\ColonyGuiHelperInterface;
@@ -81,6 +81,6 @@ public function handle(GameControllerInterface $game): void
8181
#[Override]
8282
public function getViewContext(): ViewContext
8383
{
84-
return new ViewContext(ModuleViewEnum::COLONY, self::VIEW_IDENTIFIER);
84+
return new ViewContext(ModuleEnum::COLONY, self::VIEW_IDENTIFIER);
8585
}
8686
}

‎src/Module/Colony/View/ShowShuttleManagement/ShowShuttleManagement.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Stu\Module\Colony\View\ShowShuttleManagement;
66

77
use Override;
8-
use Stu\Component\Game\ModuleViewEnum;
8+
use Stu\Component\Game\ModuleEnum;
99
use Stu\Exception\SanityCheckException;
1010
use Stu\Module\Colony\Lib\ColonyLoaderInterface;
1111
use Stu\Module\Colony\Lib\ShuttleManagementItem;
@@ -80,7 +80,7 @@ public function handle(GameControllerInterface $game): void
8080
}
8181
}
8282

83-
$game->setTemplateVar('MODULE_VIEW', ModuleViewEnum::COLONY);
83+
$game->setTemplateVar('MODULE_VIEW', ModuleEnum::COLONY);
8484
$game->setTemplateVar('WRAPPER', $this->spacecraftWrapperFactory->wrapShip($ship));
8585
$game->setTemplateVar('MANAGER', $colony);
8686
$game->setTemplateVar('CURRENTLY_STORED', $currentlyStored);

0 commit comments

Comments
 (0)