Add more enums and tests

src/Connections/Client.php

@@ -2,11 +2,13 @@
 
 namespace Timirey\XApi\Connections;
 
-use Timirey\XApi\Enums\Host;
+use Timirey\XApi\Connections\Enums\Host;
 use Timirey\XApi\Payloads\AbstractPayload;
 use Timirey\XApi\Payloads\Data\ChartLastInfoRecord;
 use Timirey\XApi\Payloads\Data\ChartRangeInfoRecord;
 use Timirey\XApi\Payloads\Data\TradeTransInfo;
+use Timirey\XApi\Payloads\Enums\Cmd;
+use Timirey\XApi\Payloads\Enums\Level;
 use Timirey\XApi\Payloads\GetAllSymbolsPayload;
 use Timirey\XApi\Payloads\GetCalendarPayload;
 use Timirey\XApi\Payloads\GetChartLastRequestPayload;
@@ -278,15 +280,15 @@ public function getIbsHistory(int $start, int $end): GetIbsHistoryResponse
      * Calculates estimated profit for given deal data.
      *
      * @param float $closePrice
-     * @param int $cmd
+     * @param Cmd $cmd
      * @param float $openPrice
      * @param string $symbol
      * @param float $volume
      * @return GetProfitCalculationResponse
      */
     public function getProfitCalculation(
         float $closePrice,
-        int $cmd,
+        Cmd $cmd,
         float $openPrice,
         string $symbol,
         float $volume
@@ -320,12 +322,12 @@ public function getStepRules(): GetStepRulesResponse
     /**
      * Returns array of current quotations for given symbols.
      *
-     * @param int $level
+     * @param Level $level
      * @param array $symbols
      * @param int $timestamp
      * @return GetTickPricesResponse
      */
-    public function getTickPrices(int $level, array $symbols, int $timestamp): GetTickPricesResponse
+    public function getTickPrices(Level $level, array $symbols, int $timestamp): GetTickPricesResponse
     {
         return $this->sendRequest(
             new GetTickPricesPayload($level, $symbols, $timestamp),

src/Enums/Host.php → src/Connections/Enums/Host.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Enums;
+namespace Timirey\XApi\Connections\Enums;
 
 /**
  * Enum representing the WebSocket host URLs for xStation5 API.

src/Payloads/Data/ChartLastInfoRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
-use Timirey\XApi\Enums\Period;
+use Timirey\XApi\Payloads\Enums\Period;
 
 /**
  * Class representing the last chart information record.
@@ -12,20 +12,14 @@
  */
 class ChartLastInfoRecord
 {
-    /**
-     * Period code.
-     */
-    public Period $period;
-
     /**
      * Constructor for ChartLastInfoRecord.
      *
-     * @param int $period Period code.
+     * @param Period $period Period code.
      * @param int $start Start of chart block.
      * @param string $symbol Symbol.
      */
-    public function __construct(int $period, public int $start, public string $symbol)
+    public function __construct(public Period $period, public int $start, public string $symbol)
     {
-        $this->period = Period::from($period);
     }
 }

src/Payloads/Data/ChartRangeInfoRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
-use Timirey\XApi\Enums\Period;
+use Timirey\XApi\Payloads\Enums\Period;
 
 /**
  * Class representing the range chart information record.
@@ -11,27 +11,21 @@
  */
 class ChartRangeInfoRecord
 {
-    /**
-     * @var Period Period code.
-     */
-    public Period $period;
-
     /**
      * Constructor for ChartRangeInfoRecord.
      *
-     * @param int $period Period code.
+     * @param Period $period Period code.
      * @param int $start Start of chart block (milliseconds since epoch).
      * @param int $end End of chart block (milliseconds since epoch).
      * @param string $symbol Symbol.
      * @param int|null $ticks Number of ticks needed (optional).
      */
     public function __construct(
-        int $period,
+        public Period $period,
         public int $start,
         public int $end,
         public string $symbol,
         public ?int $ticks = null
     ) {
-        $this->period = Period::from($period);
     }
 }

src/Payloads/Data/TradeTransInfo.php

@@ -2,6 +2,9 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
+use Timirey\XApi\Payloads\Enums\Cmd;
+use Timirey\XApi\Payloads\Enums\Type;
+
 /**
  * Class representing trade transaction information.
  *
@@ -13,7 +16,7 @@ class TradeTransInfo
     /**
      * Constructor for TradeTransInfo.
      *
-     * @param int $cmd Operation code.
+     * @param Cmd $cmd Operation code.
      * @param string|null $customComment The value the customer may provide in order to retrieve it later.
      * @param int $expiration Pending order expiration time.
      * @param int $offset Trailing offset.
@@ -22,11 +25,11 @@ class TradeTransInfo
      * @param float $sl Stop loss.
      * @param string $symbol Trade symbol.
      * @param float $tp Take profit.
-     * @param int $type Trade transaction type.
+     * @param Type $type Trade transaction type.
      * @param float $volume Trade volume.
      */
     public function __construct(
-        public int $cmd,
+        public Cmd $cmd,
         public ?string $customComment,
         public int $expiration,
         public int $offset,
@@ -35,7 +38,7 @@ public function __construct(
         public float $sl,
         public string $symbol,
         public float $tp,
-        public int $type,
+        public Type $type,
         public float $volume
     ) {
     }

src/Enums/Cmd.php → src/Payloads/Enums/Cmd.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Enums;
+namespace Timirey\XApi\Payloads\Enums;
 
 /**
  * Enum representing the command type for a trade.

src/Enums/Level.php → src/Payloads/Enums/Level.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Enums;
+namespace Timirey\XApi\Payloads\Enums;
 
 /**
  * Enum representing the price level.

src/Enums/Period.php → src/Payloads/Enums/Period.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Enums;
+namespace Timirey\XApi\Payloads\Enums;
 
 /**
  * Enum representing the period.

src/Payloads/Enums/Type.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Timirey\XApi\Payloads\Enums;
+
+/**
+ * Enum representing the order type.
+ */
+enum Type: int
+{
+    /**
+     * Order open, used for opening orders.
+     */
+    case OPEN = 0;
+
+    /**
+     * Order pending, only used in the streaming getTrades command.
+     */
+    case PENDING = 1;
+
+    /**
+     * Order close.
+     */
+    case CLOSE = 2;
+
+    /**
+     * Order modify, only used in the tradeTransaction command.
+     */
+    case MODIFY = 3;
+
+    /**
+     * Order delete, only used in the tradeTransaction command.
+     */
+    case DELETE = 4;
+}

src/Payloads/GetProfitCalculationPayload.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads;
 
-use Timirey\XApi\Enums\Cmd;
+use Timirey\XApi\Payloads\Enums\Cmd;
 
 /**
  * Class that contains payload for the getProfitCalculation command.
@@ -13,15 +13,15 @@ class GetProfitCalculationPayload extends AbstractPayload
      * Constructor for GetProfitCalculationPayload.
      *
      * @param float $closePrice Theoretical close price of order.
-     * @param int $cmd Operation code.
+     * @param Cmd $cmd Operation code.
      * @param float $openPrice Theoretical open price of order.
      * @param string $symbol Symbol.
      * @param float $volume Volume.
      */
-    public function __construct(float $closePrice, int $cmd, float $openPrice, string $symbol, float $volume)
+    public function __construct(float $closePrice, Cmd $cmd, float $openPrice, string $symbol, float $volume)
     {
         $this->arguments['closePrice'] = $closePrice;
-        $this->arguments['cmd'] = Cmd::from($cmd);
+        $this->arguments['cmd'] = $cmd->value;
         $this->arguments['openPrice'] = $openPrice;
         $this->arguments['symbol'] = $symbol;
         $this->arguments['volume'] = $volume;

src/Payloads/GetTickPricesPayload.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads;
 
-use Timirey\XApi\Enums\Level;
+use Timirey\XApi\Payloads\Enums\Level;
 
 /**
  * Class that contains payload for the getTickPrices command.
@@ -12,13 +12,13 @@ class GetTickPricesPayload extends AbstractPayload
     /**
      * Constructor for GetTickPricesPayload.
      *
-     * @param int $level Price level.
+     * @param Level $level Price level.
      * @param array $symbols Array of symbol names.
      * @param int $timestamp The time from which the most recent tick should be looked for.
      */
-    public function __construct(int $level, array $symbols, int $timestamp)
+    public function __construct(Level $level, array $symbols, int $timestamp)
     {
-        $this->arguments['level'] = Level::from($level);
+        $this->arguments['level'] = $level->value;
         $this->arguments['symbols'] = $symbols;
         $this->arguments['timestamp'] = $timestamp;
     }

src/Responses/Data/CalendarRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\Impact;
+use Timirey\XApi\Responses\Enums\Impact;
 
 /**
  * Class representing a calendar record.

src/Responses/Data/IbRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\Side;
+use Timirey\XApi\Responses\Enums\Side;
 
 /**
  * Class representing an IB record.

src/Responses/Data/QuotesRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\Day;
+use Timirey\XApi\Responses\Enums\Day;
 
 /**
  * Class representing a quotes record.

src/Responses/Data/SymbolRecord.php

@@ -2,9 +2,9 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\MarginMode;
-use Timirey\XApi\Enums\ProfitMode;
-use Timirey\XApi\Enums\QuoteId;
+use Timirey\XApi\Responses\Enums\MarginMode;
+use Timirey\XApi\Responses\Enums\ProfitMode;
+use Timirey\XApi\Responses\Enums\QuoteId;
 
 /**
  * Class representing a symbol record.

src/Responses/Data/TickRecord.php

@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\Level;
+use Timirey\XApi\Responses\Enums\Level;
 
 /**
  * Class representing a tick record.

src/Responses/Data/TradeRecord.php

@@ -2,8 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Enums\Cmd;
-use Timirey\XApi\Enums\Level;
+use Timirey\XApi\Responses\Enums\Cmd;
 
 /**
  * Class representing a trade record.

src/Responses/Data/TradingRecord.php

@@ -2,19 +2,27 @@
 
 namespace Timirey\XApi\Responses\Data;
 
+use Timirey\XApi\Responses\Enums\Day;
+
 /**
  * Class representing a trading record.
  */
 class TradingRecord
 {
+    /**
+     * @var Day Day of week.
+     */
+    public Day $day;
+
     /**
      * Constructor for TradingRecord.
      *
      * @param int $day Day of week.
      * @param int $fromT Start time in ms from 00:00 CET / CEST time zone.
      * @param int $toT End time in ms from 00:00 CET / CEST time zone.
      */
-    public function __construct(public int $day, public int $fromT, public int $toT)
+    public function __construct(int $day, public int $fromT, public int $toT)
     {
+        $this->day = Day::from($day);
     }
 }