Task/49 Upgrade valinor

.phpcs.xml

@@ -6,13 +6,22 @@
 
     <rule ref="Squiz.ControlStructures.ControlSignature">
         <properties>
-            <property name="requiredSpacesBeforeColon" value="0" />
+            <property name="requiredSpacesBeforeColon" value="1" />
         </properties>
     </rule>
+    <rule ref="PSR12.Functions.ReturnTypeDeclaration">
+        <exclude-pattern>src/Value/*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration.EmptyLine">
+        <exclude-pattern>src/Value/*</exclude-pattern>
+    </rule>
+
     <rule ref="PSR12">
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.NewlineBeforeOpenBrace" />
         <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
         <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.Indent" />
+        <exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
     </rule>
 
     <rule ref="Generic.Files.LineLength">

README.md

@@ -15,4 +15,13 @@ Get Info about your agent:
 ./spacetraders agent
 ```
 
-Add the token to `.env` file to authenticate other requests.
+Add the token to `.env` file to authenticate other requests.
+
+## Branch Names
+
+For any PR, the commit hook will check the following requirements for a branch name:
+
+1. Must start with 'task/', 'bug/', or 'feature/'
+2. Must include an issue number (digits) followed by a dash.
+3. Must end with a descriptive slug (letters, numbers, dashes).
+

bin/rector.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+CONTAINER="php"
+docker compose run \
+   --rm \
+   --workdir /var/www \
+   "$CONTAINER" \
+   ./vendor/bin/rector "$@"

cli/Command/Fleet/ExtractShipController.php

@@ -13,7 +13,7 @@
 use Phparch\SpaceTradersCLI\Render;
 
 #[HelpInfo(
-    description: "Extract mininerals at a waypoint.",
+    description: "Extract minerals at a waypoint.",
     params: ['ship symbol']
 )]
 class ExtractShipController extends CommandController
@@ -30,7 +30,6 @@ public function handle(): void
 
         try {
             $response = $client->extractShip($shipSymbol);
-            //$response = $this->getMock();
 
             $cooldown = new Render\Ship\Cooldown($response->cooldown);
             echo $cooldown->output();
@@ -42,7 +41,10 @@ public function handle(): void
         } catch (APIException $ex) {
             $error = new Render\Exception($ex);
             echo $error->output();
-            $cooldown = Value\Ship\CoolDown::fromArray($ex->data['cooldown']);
+
+            /** @var iterable<string, mixed> $raw */
+            $raw = $ex->data['cooldown'];
+            $cooldown = Value\Ship\CoolDown::fromArray($raw);
             $render = new Render\Ship\Cooldown($cooldown);
             echo $render->output();
         }

cli/Render/Agent.php

@@ -6,8 +6,7 @@ class Agent extends AbstractRenderer
 {
     public function __construct(
         public \Phparch\SpaceTraders\Value\Agent $agent,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Exception.php

@@ -6,8 +6,7 @@ class Exception extends AbstractRenderer
 {
     public function __construct(
         public \Exception $ex,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/GoodsDetailList.php

@@ -9,8 +9,7 @@ class GoodsDetailList extends AbstractRenderer
     public function __construct(
         /** @var Detail[] $goods */
         public array $goods,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Market.php

@@ -9,8 +9,7 @@ class Market extends AbstractRenderer
 {
     public function __construct(
         public Value\Market $market,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Market/Transaction.php

@@ -9,8 +9,7 @@ class Transaction extends AbstractRenderer
 {
     public function __construct(
         public readonly Value\Market\Transaction $transaction,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Market/TransactionsList.php

@@ -10,8 +10,7 @@ class TransactionsList extends AbstractRenderer
     public function __construct(
         /** @var Transaction[] $transactions */
         public array $transactions,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Ship/Nav.php

@@ -8,8 +8,7 @@ class Nav extends AbstractRenderer
 {
     public function __construct(
         public \Phparch\SpaceTraders\Value\Ship\Nav $nav,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Ship/RegistrationInfo.php

@@ -8,8 +8,7 @@ class RegistrationInfo extends AbstractRenderer
 {
     public function __construct(
         public \Phparch\SpaceTraders\Value\RegistrationInfo $info,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/TradeGoodsList.php

@@ -9,8 +9,7 @@ class TradeGoodsList extends AbstractRenderer
     public function __construct(
         /** @var TradeGoods[] */
         public array $goods,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Transaction.php

@@ -6,8 +6,7 @@ class Transaction extends AbstractRenderer
 {
     public function __construct(
         public \Phparch\SpaceTraders\Value\Shipyard\Transaction $txn,
-    )
-    {
+    ) {
     }
 
     public function output(): string

cli/Render/Waypoint.php

@@ -17,7 +17,7 @@ public function output(): string
         $this->sprintf(
             '<:BLU:>SYSTEM SYMBOL:<:DEF:> %s, <:YEL:>%s<:DEF:> (x: %d, y: %d)',
             $this->waypoint->symbol,
-            $this->waypoint->type,
+            $this->waypoint->type->value,
             $this->waypoint->x,
             $this->waypoint->y,
         );

composer.json

@@ -25,15 +25,15 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "php": ">=8.3",
+    "php": ">=8.4",
     "ext-readline": "*",
     "ext-curl": "*",
     "ext-apcu": "*",
     "minicli/minicli": "^4.2",
     "php-di/php-di": "^7.0",
     "guzzlehttp/guzzle": "^7.8",
     "vlucas/phpdotenv": "^5.6",
-    "cuyz/valinor": "^1.14",
+    "cuyz/valinor": "^2.3",
     "predis/predis": "^2.3",
     "kevinrob/guzzle-cache-middleware": "^5.1",
     "symfony/cache": "^7.2",
@@ -45,15 +45,16 @@
     "twig/twig": "^3.0"
   },
   "require-dev": {
-    "phpstan/phpstan": "^2.0",
+    "phpstan/phpstan": "^2.1",
     "brainmaestro/composer-git-hooks": "^3.0",
     "squizlabs/php_codesniffer": "^4.0",
     "phpmd/phpmd": "3.x-dev",
     "pdepend/pdepend": "3.x-dev",
     "phpbench/phpbench": "^1.4",
     "vincentlanglet/twig-cs-fixer": "^3.8",
     "bmitch/churn-php": "^1.7",
-    "phparkitect/phparkitect": "^0.7.0"
+    "phparkitect/phparkitect": "^0.7.0",
+    "rector/rector": "^2.3"
   },
   "extra": {
     "hooks": {
@@ -73,7 +74,7 @@
     "check-code": ["@phpcs",  "@phpstan", "@phparkitect"],
     "phpmd": "vendor/bin/phpmd --ignore-violations-on-exit --ignore-errors-on-exit src text phpmd.xml" ,
     "phpstan": "vendor/bin/phpstan --memory-limit=1G",
-    "phpcs": "vendor/bin/phpcs",
+    "phpcs": "vendor/bin/phpcs -s",
     "phpcbf": "vendor/bin/phpcbf",
     "churn": "vendor/bin/churn",
     "phparkitect": "vendor/bin/phparkitect check",