Skip to content

Commit

Permalink
Temporarily PHP8.1 Enum "Status"
Browse files Browse the repository at this point in the history
  • Loading branch information
brtdv committed Jan 11, 2023
1 parent 4b88c94 commit 9d759d9
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 31 deletions.
8 changes: 4 additions & 4 deletions src/Exception/ApiException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

use RuntimeException;
use Throwable;
use Brtdv\TwelveData\Models\Status;


class ApiException extends RuntimeException
{
private Status $status;
private string $status;

public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, ?Status $status = null)
public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null, ?string $status = null)
{
parent::__construct($message, $code, $previous);
$this->status = $status;
}

public function getStatus(): Status
public function getStatus(): string
{
return $this->status;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Hydrator/ModelHydrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Psr\Http\Message\ResponseInterface;
use Brtdv\TwelveData\Exception\ApiException;
use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;


final class ModelHydrator implements Hydrator
{
Expand All @@ -21,8 +21,8 @@ public function hydrate(ResponseInterface $response, string $class): ApiResponse

$data = json_decode($body, true, 512, JSON_THROW_ON_ERROR);

if (isset($data['status']) && Status::ERROR === Status::from($data['status'])) {
throw new ApiException($data['message'], $data['code'], null, Status::from($data['status']));
if (isset($data['status']) && 'error' == $data['status']) {
throw new ApiException($data['message'], $data['code'], null, $data['status']);
}

if (is_subclass_of($class, ApiResponse::class)) {
Expand Down
3 changes: 1 addition & 2 deletions src/Models/CryptoCurrencies/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\CryptoCurrencies;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -26,7 +25,7 @@ public static function create(array $responseData)
$model = new self();

$model->data = $data;
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

return $model;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Models/Exchanges/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\Exchanges;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -26,7 +25,7 @@ public static function create(array $responseData)
$model = new self();

$model->data = $data;
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

return $model;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Models/ForexPairs/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\ForexPairs;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -26,7 +25,7 @@ public static function create(array $responseData)
$model = new self();

$model->data = $data;
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

return $model;
}
Expand Down
9 changes: 0 additions & 9 deletions src/Models/Status.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Models/StatusProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

interface StatusProvider
{
public function getStatus(): ?Status;
public function getStatus(): ?string;
}
4 changes: 2 additions & 2 deletions src/Models/StatusResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

trait StatusResponse
{
private ?Status $status;
private ?string $status;

public function getStatus(): ?Status
public function getStatus(): ?string
{
return $this->status;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Models/Stocks/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\Stocks;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -26,7 +25,7 @@ public static function create(array $responseData)
$model = new self();

$model->data = $data;
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

return $model;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Models/SymbolSearch/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\SymbolSearch;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -26,7 +25,7 @@ public static function create(array $responseData)
$model = new self();

$model->data = $data;
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

return $model;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Models/TimeSeries/GetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Brtdv\TwelveData\Models\TimeSeries;

use Brtdv\TwelveData\Models\ApiResponse;
use Brtdv\TwelveData\Models\Status;
use Brtdv\TwelveData\Models\StatusProvider;
use Brtdv\TwelveData\Models\StatusResponse;

Expand All @@ -21,7 +20,7 @@ public static function create(array $responseData)
$model = new self();

$model->meta = StockMeta::create($responseData['meta']);
$model->status = Status::from($responseData['status']);
$model->status = $responseData['status']

$values = [];

Expand Down

0 comments on commit 9d759d9

Please sign in to comment.