@@ -6,11 +6,11 @@ |
||
6 | 6 | use Carpenstar\ByBitAPI\Derivatives\MarketData\Kline\Interfaces\IKlineDto; |
7 | 7 | |
8 | 8 | |
9 | -<<<<<<<< HEAD:src/Derivatives/MarketData/Kline/Response/KlineResponse.php |
|
9 | +<< << << << HEAD:src / Derivatives / MarketData / Kline / Response / KlineResponse.php |
|
10 | 10 | class KlineResponse extends ResponseEntity implements IKlineDto |
11 | -======== |
|
11 | +=== === == |
|
12 | 12 | class KlineAbstractResponse extends AbstractResponse implements IKlineDto |
13 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/Kline/Response/KlineAbstractResponse.php |
|
13 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / Kline / Response / KlineAbstractResponse.php |
|
14 | 14 | { |
15 | 15 | /** |
16 | 16 | * @var \DateTime $start |
@@ -4,11 +4,11 @@ |
||
4 | 4 | use Carpenstar\ByBitAPI\Core\Helpers\DateTimeHelper; |
5 | 5 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
6 | 6 | |
7 | -<<<<<<<< HEAD:src/Derivatives/MarketData/OpenInterest/Response/OpenInterestResponse.php |
|
7 | +<< << << << HEAD:src / Derivatives / MarketData / OpenInterest / Response / OpenInterestResponse.php |
|
8 | 8 | class OpenInterestResponse extends ResponseEntity |
9 | -======== |
|
9 | +=== === == |
|
10 | 10 | class OpenInterestAbstractResponse extends AbstractResponse |
11 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/OpenInterest/Response/OpenInterestAbstractResponse.php |
|
11 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / OpenInterest / Response / OpenInterestAbstractResponse.php |
|
12 | 12 | { |
13 | 13 | /** |
14 | 14 | * Open interest |
@@ -5,11 +5,11 @@ |
||
5 | 5 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
6 | 6 | use Carpenstar\ByBitAPI\Derivatives\MarketData\FundingRateHistory\Interfaces\IFundingRateHistoryResponse; |
7 | 7 | |
8 | -<<<<<<<< HEAD:src/Derivatives/MarketData/FundingRateHistory/Response/FundingRateHistoryResponse.php |
|
8 | +<< << << << HEAD:src / Derivatives / MarketData / FundingRateHistory / Response / FundingRateHistoryResponse.php |
|
9 | 9 | class FundingRateHistoryResponse extends ResponseEntity implements IFundingRateHistoryResponse |
10 | -======== |
|
10 | +=== === == |
|
11 | 11 | class FundingRateHistoryAbstractResponse extends AbstractResponse implements IFundingRateHistoryResponse |
12 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/FundingRateHistory/Response/FundingRateHistoryAbstractResponse.php |
|
12 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / FundingRateHistory / Response / FundingRateHistoryAbstractResponse.php |
|
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * Symbol name |
@@ -4,11 +4,11 @@ discard block |
||
4 | 4 | use Carpenstar\ByBitAPI\Core\Objects\AbstractResponse; |
5 | 5 | use Carpenstar\ByBitAPI\Derivatives\MarketData\RiskLimit\Interfaces\IRiskLimitsResponse; |
6 | 6 | |
7 | -<<<<<<<< HEAD:src/Derivatives/MarketData/RiskLimit/Response/RiskLimitsResponse.php |
|
7 | +<< << << << HEAD:src / Derivatives / MarketData / RiskLimit / Response / RiskLimitsResponse.php |
|
8 | 8 | class RiskLimitsResponse extends ResponseEntity implements IRiskLimitsResponse |
9 | -======== |
|
9 | +=== === == |
|
10 | 10 | class RiskLimitsAbstractResponse extends AbstractResponse implements IRiskLimitsResponse |
11 | ->>>>>>>> 4cd7e07 (Version v.3.0.0):src/Derivatives/MarketData/RiskLimit/Response/RiskLimitsAbstractResponse.php |
|
11 | +>> >> >> >> 4cd7e07(Version v.3.0.0):src / Derivatives / MarketData / RiskLimit / Response / RiskLimitsAbstractResponse.php |
|
12 | 12 | { |
13 | 13 | /** |
14 | 14 | * Risk id |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | ->setMaintainMargin($data['maintainMargin']) |
63 | 63 | ->setMaxLeverage($data['maxLeverage']); |
64 | 64 | |
65 | - if(!empty($data['isLowerRisk'])) { |
|
65 | + if (!empty($data['isLowerRisk'])) { |
|
66 | 66 | $this->setIsLowerRisk($data['isLowerRisk']); |
67 | 67 | } |
68 | 68 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $this->assertNotEmpty($indexPriceKlineData->getBody()->count()); |
23 | 23 | |
24 | 24 | /** @var IndexPriceKlineAbstractResponse $klineItem */ |
25 | - while(!empty($klineItem = $indexPriceKlineData->getBody()->fetch())) { |
|
25 | + while (!empty($klineItem = $indexPriceKlineData->getBody()->fetch())) { |
|
26 | 26 | $this->assertInstanceOf(IndexPriceKlineAbstractResponse::class, $klineItem); |
27 | 27 | $this->assertInstanceOf(\DateTime::class, $klineItem->getStart()); |
28 | 28 | $this->assertIsFloat($klineItem->getOpen()); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $this->assertNotEmpty($fundingRateHistoryData->getBody()->count()); |
23 | 23 | |
24 | 24 | /** @var FundingRateHistoryAbstractResponse $historyItem */ |
25 | - while(!empty($historyItem = $fundingRateHistoryData->getBody()->fetch())) { |
|
25 | + while (!empty($historyItem = $fundingRateHistoryData->getBody()->fetch())) { |
|
26 | 26 | $this->assertInstanceOf(FundingRateHistoryAbstractResponse::class, $historyItem); |
27 | 27 | $this->assertIsString($historyItem->getSymbol()); |
28 | 28 | $this->assertIsFloat($historyItem->getFundingRate()); |