@@ -5,11 +5,11 @@ |
||
5 | 5 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
6 | 6 | use Carpenstar\ByBitAPI\Derivatives\MarketData\IndexPriceKline\Interfaces\IIndexPriceKlineResponse; |
7 | 7 | |
8 | -<<<<<<<< HEAD:src/Derivatives/MarketData/IndexPriceKline/Response/IndexPriceKlineResponse.php |
|
8 | +<< << << << HEAD:src / Derivatives / MarketData / IndexPriceKline / Response / IndexPriceKlineResponse.php |
|
9 | 9 | class IndexPriceKlineResponse extends ResponseEntity implements IIndexPriceKlineResponse |
10 | -======== |
|
10 | +=== === == |
|
11 | 11 | class IndexPriceKlineAbstractResponse extends AbstractResponse implements IIndexPriceKlineResponse |
12 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/IndexPriceKline/Response/IndexPriceKlineAbstractResponse.php |
|
12 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / IndexPriceKline / Response / IndexPriceKlineAbstractResponse.php |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * @var \DateTime $start |
@@ -5,11 +5,11 @@ |
||
5 | 5 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
6 | 6 | use Carpenstar\ByBitAPI\Derivatives\MarketData\PublicTradingHistory\Interfaces\IPublicTradingHistoryResponse; |
7 | 7 | |
8 | -<<<<<<<< HEAD:src/Derivatives/MarketData/PublicTradingHistory/Response/PublicTradingHistoryResponse.php |
|
8 | +<< << << << HEAD:src / Derivatives / MarketData / PublicTradingHistory / Response / PublicTradingHistoryResponse.php |
|
9 | 9 | class PublicTradingHistoryResponse extends ResponseEntity implements IPublicTradingHistoryResponse |
10 | -======== |
|
10 | +=== === == |
|
11 | 11 | class PublicTradingHistoryAbstractResponse extends AbstractResponse implements IPublicTradingHistoryResponse |
12 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/PublicTradingHistory/Response/PublicTradingHistoryAbstractResponse.php |
|
12 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / PublicTradingHistory / Response / PublicTradingHistoryAbstractResponse.php |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * Execution id |
@@ -5,11 +5,11 @@ discard block |
||
5 | 5 | use Carpenstar\ByBitAPI\Core\Helpers\DateTimeHelper; |
6 | 6 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
7 | 7 | |
8 | -<<<<<<<< HEAD:src/Derivatives/MarketData/TickerInfo/Response/TickerInfoResponse.php |
|
8 | +<< << << << HEAD:src / Derivatives / MarketData / TickerInfo / Response / TickerInfoResponse.php |
|
9 | 9 | class TickerInfoResponse extends ResponseEntity |
10 | -======== |
|
10 | +=== === == |
|
11 | 11 | class TickerInfoAbstractResponse extends AbstractResponse |
12 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/TickerInfo/Response/TickerInfoAbstractResponse.php |
|
12 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / TickerInfo / Response / TickerInfoAbstractResponse.php |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * Symbol name |
@@ -163,11 +163,11 @@ discard block |
||
163 | 163 | ->setTurnover24h($data['turnover24h']) |
164 | 164 | ->setVolume24h($data['volume24h']) |
165 | 165 | ->setFundingRate($data['fundingRate']) |
166 | - ->setNextFundingTime((int)$data['nextFundingTime']) |
|
167 | - ->setPredictedDeliveryPrice((float)$data['predictedDeliveryPrice']) |
|
168 | - ->setBasisRate((float)$data['basisRate']) |
|
169 | - ->setDeliveryFeeRate((float)$data['deliveryFeeRate']) |
|
170 | - ->setDeliveryTime((int)$data['deliveryTime']) |
|
166 | + ->setNextFundingTime((int) $data['nextFundingTime']) |
|
167 | + ->setPredictedDeliveryPrice((float) $data['predictedDeliveryPrice']) |
|
168 | + ->setBasisRate((float) $data['basisRate']) |
|
169 | + ->setDeliveryFeeRate((float) $data['deliveryFeeRate']) |
|
170 | + ->setDeliveryTime((int) $data['deliveryTime']) |
|
171 | 171 | ->setOpenInterestValue($data['openInterestValue']); |
172 | 172 | } |
173 | 173 | |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | */ |
455 | 455 | public function getOpenInterests(): float |
456 | 456 | { |
457 | - return (float)$this->openInterests; |
|
457 | + return (float) $this->openInterests; |
|
458 | 458 | } |
459 | 459 | |
460 | 460 | /** |
@@ -5,11 +5,11 @@ |
||
5 | 5 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
6 | 6 | use Carpenstar\ByBitAPI\Derivatives\MarketData\MarkPriceKline\Interfaces\IMarkPriceKline; |
7 | 7 | |
8 | -<<<<<<<< HEAD:src/Derivatives/MarketData/MarkPriceKline/Response/MarkPriceKlineResponse.php |
|
8 | +<< << << << HEAD:src / Derivatives / MarketData / MarkPriceKline / Response / MarkPriceKlineResponse.php |
|
9 | 9 | class MarkPriceKlineResponse extends ResponseEntity implements IMarkPriceKline |
10 | -======== |
|
10 | +=== === == |
|
11 | 11 | class MarkPriceKlineAbstractResponse extends AbstractResponse implements IMarkPriceKline |
12 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/MarkPriceKline/Response/MarkPriceKlineAbstractResponse.php |
|
12 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / MarkPriceKline / Response / MarkPriceKlineAbstractResponse.php |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * @var \DateTime $start |
@@ -4,11 +4,11 @@ |
||
4 | 4 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
5 | 5 | use Carpenstar\ByBitAPI\Derivatives\MarketData\InstrumentInfo\Interfaces\IPriceFilterItem; |
6 | 6 | |
7 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/PriceFilterItemResponse.php |
|
7 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / PriceFilterItemResponse.php |
|
8 | 8 | class PriceFilterItemResponse extends ResponseEntity implements IPriceFilterItem |
9 | -======== |
|
9 | +=== === == |
|
10 | 10 | class PriceFilterItemAbstractResponse extends AbstractResponse implements IPriceFilterItem |
11 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/PriceFilterItemAbstractResponse.php |
|
11 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / PriceFilterItemAbstractResponse.php |
|
12 | 12 | { |
13 | 13 | /** |
14 | 14 | * Min. order price |
@@ -8,11 +8,11 @@ discard block |
||
8 | 8 | use Carpenstar\ByBitAPI\Derivatives\MarketData\InstrumentInfo\Interfaces\IInstrumentInfoResponse; |
9 | 9 | use DateTime; |
10 | 10 | |
11 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoResponse.php |
|
11 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoResponse.php |
|
12 | 12 | class InstrumentInfoResponse extends ResponseEntity implements IInstrumentInfoResponse |
13 | -======== |
|
13 | +=== === == |
|
14 | 14 | class InstrumentInfoAbstractResponse extends AbstractResponse implements IInstrumentInfoResponse |
15 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoAbstractResponse.php |
|
15 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoAbstractResponse.php |
|
16 | 16 | { |
17 | 17 | /** |
18 | 18 | * Derivatives products category. Keeps empty string `""` when `category` is not passed |
@@ -108,32 +108,32 @@ discard block |
||
108 | 108 | $lotSizeFilterCollection = new EntityCollection(); |
109 | 109 | |
110 | 110 | if (!empty($data['priceFilter'])) { |
111 | - array_map(function ($priceFilter) use ($priceFilterCollection) { |
|
112 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoResponse.php |
|
111 | + array_map(function($priceFilter) use ($priceFilterCollection) { |
|
112 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoResponse.php |
|
113 | 113 | $priceFilterCollection->push(ResponseBuilder::make(PriceFilterItemResponse::class, $priceFilter)); |
114 | -======== |
|
114 | +=== === == |
|
115 | 115 | $priceFilterCollection->push(ResponseBuilder::make(PriceFilterItemAbstractResponse::class, $priceFilter)); |
116 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoAbstractResponse.php |
|
116 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoAbstractResponse.php |
|
117 | 117 | }, [$data['priceFilter']]); |
118 | 118 | } |
119 | 119 | |
120 | 120 | if (!empty($data['leverageFilter'])) { |
121 | - array_map(function ($leverageFilterItem) use ($leverageFilterCollection) { |
|
122 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoResponse.php |
|
121 | + array_map(function($leverageFilterItem) use ($leverageFilterCollection) { |
|
122 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoResponse.php |
|
123 | 123 | $leverageFilterCollection->push(ResponseBuilder::make(LeverageFilterItemResponse::class, $leverageFilterItem)); |
124 | -======== |
|
124 | +=== === == |
|
125 | 125 | $leverageFilterCollection->push(ResponseBuilder::make(LeverageFilterItemAbstractResponse::class, $leverageFilterItem)); |
126 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoAbstractResponse.php |
|
126 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoAbstractResponse.php |
|
127 | 127 | }, [$data['leverageFilter']]); |
128 | 128 | } |
129 | 129 | |
130 | 130 | if (!empty($data['lotSizeFilter'])) { |
131 | - array_map(function ($lotSizeFilterItem) use ($lotSizeFilterCollection) { |
|
132 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoResponse.php |
|
131 | + array_map(function($lotSizeFilterItem) use ($lotSizeFilterCollection) { |
|
132 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoResponse.php |
|
133 | 133 | $lotSizeFilterCollection->push(ResponseBuilder::make(LotSizeFilterItemResponse::class, $lotSizeFilterItem)); |
134 | -======== |
|
134 | +=== === == |
|
135 | 135 | $lotSizeFilterCollection->push(ResponseBuilder::make(LotSizeFilterItemAbstractResponse::class, $lotSizeFilterItem)); |
136 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/InstrumentInfoAbstractResponse.php |
|
136 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / InstrumentInfoAbstractResponse.php |
|
137 | 137 | }, [$data['lotSizeFilter']]); |
138 | 138 | } |
139 | 139 | |
@@ -145,10 +145,10 @@ discard block |
||
145 | 145 | ->setQuoteCoin($data['quoteCoin']) |
146 | 146 | ->setLaunchTime($data['launchTime']) |
147 | 147 | ->setDeliveryTime($data['deliveryTime']) |
148 | - ->setDeliveryFeeRate((float)$data['deliveryFeeRate']) |
|
148 | + ->setDeliveryFeeRate((float) $data['deliveryFeeRate']) |
|
149 | 149 | ->setPriceScale($data['priceScale'] ?? 0.0) |
150 | - ->setUnifiedMarginTrade((bool)$data['unifiedMarginTrade']) |
|
151 | - ->setFundingInterval((int)$data['fundingInterval']) |
|
150 | + ->setUnifiedMarginTrade((bool) $data['unifiedMarginTrade']) |
|
151 | + ->setFundingInterval((int) $data['fundingInterval']) |
|
152 | 152 | ->setSettleCoin($data['settleCoin']) |
153 | 153 | ->setLeverageFilter($leverageFilterCollection) |
154 | 154 | ->setPriceFilter($priceFilterCollection) |
@@ -4,11 +4,11 @@ |
||
4 | 4 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
5 | 5 | use Carpenstar\ByBitAPI\Derivatives\MarketData\InstrumentInfo\Interfaces\ILotSizeFilterItem; |
6 | 6 | |
7 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/LotSizeFilterItemResponse.php |
|
7 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / LotSizeFilterItemResponse.php |
|
8 | 8 | class LotSizeFilterItemResponse extends ResponseEntity implements ILotSizeFilterItem |
9 | -======== |
|
9 | +=== === == |
|
10 | 10 | class LotSizeFilterItemAbstractResponse extends AbstractResponse implements ILotSizeFilterItem |
11 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/LotSizeFilterItemAbstractResponse.php |
|
11 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / LotSizeFilterItemAbstractResponse.php |
|
12 | 12 | { |
13 | 13 | private float $maxOrderQty; |
14 | 14 |
@@ -4,11 +4,11 @@ |
||
4 | 4 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
5 | 5 | use Carpenstar\ByBitAPI\Derivatives\MarketData\InstrumentInfo\Interfaces\ILeverageFilterItem; |
6 | 6 | |
7 | -<<<<<<<< HEAD:src/Derivatives/MarketData/InstrumentInfo/Response/LeverageFilterItemResponse.php |
|
7 | +<< << << << HEAD:src / Derivatives / MarketData / InstrumentInfo / Response / LeverageFilterItemResponse.php |
|
8 | 8 | class LeverageFilterItemResponse extends ResponseEntity implements ILeverageFilterItem |
9 | -======== |
|
9 | +=== === == |
|
10 | 10 | class LeverageFilterItemAbstractResponse extends AbstractResponse implements ILeverageFilterItem |
11 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/InstrumentInfo/Response/LeverageFilterItemAbstractResponse.php |
|
11 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / InstrumentInfo / Response / LeverageFilterItemAbstractResponse.php |
|
12 | 12 | { |
13 | 13 | /** |
14 | 14 | * Min. leverage |
@@ -3,11 +3,11 @@ |
||
3 | 3 | |
4 | 4 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
5 | 5 | |
6 | -<<<<<<<< HEAD:src/Derivatives/MarketData/OrderBook/Response/OrderBookPriceItemResponse.php |
|
6 | +<< << << << HEAD:src / Derivatives / MarketData / OrderBook / Response / OrderBookPriceItemResponse.php |
|
7 | 7 | class OrderBookPriceItemResponse extends ResponseEntity |
8 | -======== |
|
8 | +=== === == |
|
9 | 9 | class OrderBookPriceItemAbstractResponse extends AbstractResponse |
10 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/OrderBook/Response/OrderBookPriceItemAbstractResponse.php |
|
10 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / OrderBook / Response / OrderBookPriceItemAbstractResponse.php |
|
11 | 11 | { |
12 | 12 | /** |
13 | 13 | * @var float $price |