Skip to content

Commit 287b8bd

Browse files
authored
Task/72 Value namespace reorg (#75)
* Reorganize value classes with a common prefix into namespaces * Move Valinor mapper to trait * Removes abstract base class for responses. * Move agents and waypoint responses to value namespace * Remaining classes in Resources namespace to Value namespace * Reorganize System classes
1 parent c1dd40a commit 287b8bd

File tree

132 files changed

+705
-628
lines changed

Some content is hidden

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

132 files changed

+705
-628
lines changed

cli/Command/Fleet/DockShipController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use InvalidArgumentException;
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
8-
use Phparch\SpaceTraders\Response\Fleet\DockShip;
98
use Phparch\SpaceTraders\ServiceContainer;
9+
use Phparch\SpaceTraders\Value\Fleet\DockShip;
1010
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1111
use Phparch\SpaceTradersCLI\Render;
1212

cli/Command/Fleet/ExtractShipController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
use InvalidArgumentException;
66
use Minicli\Command\CommandController;
7+
use Phparch\SpaceTraders\APIException;
78
use Phparch\SpaceTraders\Client;
8-
use Phparch\SpaceTraders\Response\Fleet\ExtractResources;
99
use Phparch\SpaceTraders\ServiceContainer;
10-
use Phparch\SpaceTraders\APIException;
1110
use Phparch\SpaceTraders\Value;
11+
use Phparch\SpaceTraders\Value\Fleet\ExtractResources;
1212
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1313
use Phparch\SpaceTradersCLI\Render;
1414

@@ -42,7 +42,7 @@ public function handle(): void
4242
} catch (APIException $ex) {
4343
$error = new Render\Exception($ex);
4444
echo $error->output();
45-
$cooldown = Value\ShipCoolDown::fromArray($ex->data['cooldown']);
45+
$cooldown = Value\Ship\CoolDown::fromArray($ex->data['cooldown']);
4646
$render = new Render\Ship\Cooldown($cooldown);
4747
echo $render->output();
4848
}

cli/Command/Fleet/NavigateShipController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
use InvalidArgumentException;
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
8-
use Phparch\SpaceTraders\Response\Fleet\NavigateShip;
98
use Phparch\SpaceTraders\ServiceContainer;
10-
use Phparch\SpaceTraders\Value\WaypointSymbol;
9+
use Phparch\SpaceTraders\Value\Fleet\NavigateShip;
10+
use Phparch\SpaceTraders\Value\Waypoint;
1111
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1212
use Phparch\SpaceTradersCLI\Render;
1313

@@ -31,7 +31,7 @@ public function handle(): void
3131
if (!$waypoint) {
3232
throw new InvalidArgumentException("Please specify waypoint as third parameter");
3333
}
34-
$waypoint = new WaypointSymbol($waypoint);
34+
$waypoint = new Waypoint\Symbol($waypoint);
3535

3636
$response = $client->navigateShip($shipSymbol, $waypoint);
3737

cli/Command/Fleet/OrbitShipController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
88
use Phparch\SpaceTraders\ServiceContainer;
9-
use Phparch\SpaceTraders\Response\Fleet\OrbitShip;
9+
use Phparch\SpaceTraders\Value\Fleet\OrbitShip;
1010
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1111
use Phparch\SpaceTradersCLI\Render;
1212

cli/Command/Fleet/PurchaseShipController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
88
use Phparch\SpaceTraders\ServiceContainer;
9-
use Phparch\SpaceTraders\Value\WaypointSymbol;
9+
use Phparch\SpaceTraders\Value\Waypoint;
1010
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1111
use Phparch\SpaceTradersCLI\Render;
1212

@@ -25,7 +25,7 @@ public function handle(): void
2525
if (!$waypoint) {
2626
throw new InvalidArgumentException("Please specify waypoint as third parameter");
2727
}
28-
$waypoint = new WaypointSymbol($waypoint);
28+
$waypoint = new Waypoint\Symbol($waypoint);
2929

3030
$type = strtoupper($args[4]);
3131
if (!$type) {

cli/Command/Fleet/RefuelShipController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use InvalidArgumentException;
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
8-
use Phparch\SpaceTraders\Response\Fleet\RefuelShip;
98
use Phparch\SpaceTraders\ServiceContainer;
9+
use Phparch\SpaceTraders\Value\Fleet\RefuelShip;
1010
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1111
use Phparch\SpaceTradersCLI\Render;
1212

cli/Command/Systems/MarketController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Minicli\Command\CommandController;
77
use Phparch\SpaceTraders\Client;
88
use Phparch\SpaceTraders\ServiceContainer;
9-
use Phparch\SpaceTraders\Value\WaypointSymbol;
9+
use Phparch\SpaceTraders\Value\Waypoint;
1010
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1111
use Phparch\SpaceTradersCLI\Render;
1212

@@ -31,7 +31,7 @@ public function handle(): void
3131
throw new InvalidArgumentException("Invalid characters in waypoing ID");
3232
}
3333

34-
$wp = new WaypointSymbol($id);
34+
$wp = new Waypoint\Symbol($id);
3535
$market = $client->market($wp->system, $wp->waypoint);
3636

3737
$r = new Render\Market($market);

cli/Command/Systems/ShipyardController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Phparch\SpaceTraders\Client;
88
use Phparch\SpaceTraders\ServiceContainer;
99
use Phparch\SpaceTraders\Trait\TerminalOutputHelper;
10-
use Phparch\SpaceTraders\Value\WaypointSymbol;
10+
use Phparch\SpaceTraders\Value\Waypoint;
1111
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1212
use Phparch\SpaceTradersCLI\Render;
1313

@@ -31,7 +31,7 @@ public function handle(): void
3131
throw new InvalidArgumentException("Invalid characters in waypoing ID");
3232
}
3333

34-
$wp = new WaypointSymbol($id);
34+
$wp = new Waypoint\Symbol($id);
3535

3636
$shipyard = $client->shipyard($wp->system, $wp->waypoint);
3737

cli/Command/Systems/WaypointController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Phparch\SpaceTraders\Client;
88
use Phparch\SpaceTraders\ServiceContainer;
99
use Phparch\SpaceTraders\Trait\TerminalOutputHelper;
10-
use Phparch\SpaceTraders\Value\WaypointSymbol;
10+
use Phparch\SpaceTraders\Value\Waypoint;
1111
use Phparch\SpaceTradersCLI\Command\HelpInfo;
1212
use Phparch\SpaceTradersCLI\Render;
1313

@@ -31,7 +31,7 @@ public function handle(): void
3131
throw new InvalidArgumentException("Invalid characters in waypoing ID");
3232
}
3333

34-
$point = new WaypointSymbol($id);
34+
$point = new Waypoint\Symbol($id);
3535

3636
$point = $client->systemLocation($point->system, $point->waypoint);
3737
$renderer = new Render\Waypoint($point);

cli/Render/Agent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class Agent extends AbstractRenderer
66
{
77
public function __construct(
8-
public \Phparch\SpaceTraders\Response\Agent $agent,
8+
public \Phparch\SpaceTraders\Value\Agent $agent,
99
)
1010
{
1111
}

0 commit comments

Comments
 (0)