Skip to content

Commit

Permalink
Update enums and paths
Browse files Browse the repository at this point in the history
  • Loading branch information
timirey committed Jul 1, 2024
1 parent ae6f5a2 commit e1353c8
Show file tree
Hide file tree
Showing 31 changed files with 51 additions and 190 deletions.
12 changes: 5 additions & 7 deletions src/Connections/Client.php → src/Client.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

namespace Timirey\XApi\Connections;
namespace Timirey\XApi;

use Timirey\XApi\Connections\Enums\Host;
use Timirey\XApi\Enums\Cmd;
use Timirey\XApi\Enums\Host;
use Timirey\XApi\Enums\Level;
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;
Expand Down Expand Up @@ -64,8 +64,6 @@

/**
* Client class for interacting with the xStation5 API.
*
* todo: rename this class and think of better folder structure.
*/
class Client
{
Expand Down Expand Up @@ -397,7 +395,7 @@ public function getVersion(): GetVersionResponse
* @param AbstractPayload $payload The payload to send.
* @param class-string<T> $responseClass The response class to instantiate.
* @return AbstractResponse The response instance.
* @return T
* @return AbstractResponse
*/
protected function sendRequest(AbstractPayload $payload, string $responseClass): AbstractResponse
{
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/Enums/Cmd.php → src/Enums/Cmd.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Payloads\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the command type for a trade.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Enums/Day.php → src/Enums/Day.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the day of the week.
Expand Down
2 changes: 1 addition & 1 deletion src/Connections/Enums/Host.php → src/Enums/Host.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Connections\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the WebSocket host URLs for xStation5 API.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Enums/Impact.php → src/Enums/Impact.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the impact level.
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/Enums/Level.php → src/Enums/Level.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Payloads\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the price level.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the margin mode.
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/Enums/Period.php → src/Enums/Period.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Payloads\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the period.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the profit mode.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Enums/QuoteId.php → src/Enums/QuoteId.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the source of price.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the request status.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Enums/Side.php → src/Enums/Side.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Responses\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the side of a trade.
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/Enums/Type.php → src/Enums/Type.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Timirey\XApi\Payloads\Enums;
namespace Timirey\XApi\Enums;

/**
* Enum representing the order type.
Expand Down
3 changes: 1 addition & 2 deletions src/Payloads/Data/ChartLastInfoRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

namespace Timirey\XApi\Payloads\Data;

use Timirey\XApi\Payloads\Enums\Period;
use Timirey\XApi\Enums\Period;

/**
* Class representing the last chart information record.
*
* todo: make period behave as an enum.
* todo: start should be DateTime?
*/
class ChartLastInfoRecord
Expand Down
4 changes: 1 addition & 3 deletions src/Payloads/Data/ChartRangeInfoRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

namespace Timirey\XApi\Payloads\Data;

use Timirey\XApi\Payloads\Enums\Period;
use Timirey\XApi\Enums\Period;

/**
* Class representing the range chart information record.
*
* todo: make period behave as an enum.
*/
class ChartRangeInfoRecord
{
Expand Down
5 changes: 2 additions & 3 deletions src/Payloads/Data/TradeTransInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

namespace Timirey\XApi\Payloads\Data;

use Timirey\XApi\Payloads\Enums\Cmd;
use Timirey\XApi\Payloads\Enums\Type;
use Timirey\XApi\Enums\Cmd;
use Timirey\XApi\Enums\Type;

/**
* Class representing trade transaction information.
*
* todo: find out which properties are optional.
* todo: make cmd and type behave as enum.
*/
class TradeTransInfo
{
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/GetProfitCalculationPayload.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Payloads;

use Timirey\XApi\Payloads\Enums\Cmd;
use Timirey\XApi\Enums\Cmd;

/**
* Class that contains payload for the getProfitCalculation command.
Expand Down
2 changes: 1 addition & 1 deletion src/Payloads/GetTickPricesPayload.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Payloads;

use Timirey\XApi\Payloads\Enums\Level;
use Timirey\XApi\Enums\Level;

/**
* Class that contains payload for the getTickPrices command.
Expand Down
3 changes: 1 addition & 2 deletions src/Responses/Data/CalendarRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Impact;
use Timirey\XApi\Enums\Impact;

/**
* Class representing a calendar record.
*
* todo: make impact act as enum.
* todo: time should be DateTime?
*/
class CalendarRecord
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Data/IbRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Side;
use Timirey\XApi\Enums\Side;

/**
* Class representing an IB record.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Data/QuotesRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Day;
use Timirey\XApi\Enums\Day;

/**
* Class representing a quotes record.
Expand Down
7 changes: 3 additions & 4 deletions src/Responses/Data/SymbolRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\MarginMode;
use Timirey\XApi\Responses\Enums\ProfitMode;
use Timirey\XApi\Responses\Enums\QuoteId;
use Timirey\XApi\Enums\MarginMode;
use Timirey\XApi\Enums\ProfitMode;
use Timirey\XApi\Enums\QuoteId;

/**
* Class representing a symbol record.
*
* todo: find out which properties are nullable.
* todo: make quoteId, marginMode and profitMode behave as enum.
*/
class SymbolRecord
{
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Data/TickRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Level;
use Timirey\XApi\Enums\Level;

/**
* Class representing a tick record.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Data/TradeRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Cmd;
use Timirey\XApi\Enums\Cmd;

/**
* Class representing a trade record.
Expand Down
2 changes: 1 addition & 1 deletion src/Responses/Data/TradingRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Timirey\XApi\Responses\Data;

use Timirey\XApi\Responses\Enums\Day;
use Timirey\XApi\Enums\Day;

/**
* Class representing a trading record.
Expand Down
49 changes: 0 additions & 49 deletions src/Responses/Enums/Cmd.php

This file was deleted.

24 changes: 0 additions & 24 deletions src/Responses/Enums/Level.php

This file was deleted.

Loading

0 comments on commit e1353c8

Please sign in to comment.