Skip to content

Commit 48b1ede

Browse files
thomaspoignantthomaspoignant
committed
fix linter issue
Signed-off-by: Thomas Poignant <[email protected]>
1 parent cb5035f commit 48b1ede

18 files changed

+353
-289
lines changed

‎providers/GoFeatureFlag/.php-cs-fixer.cache

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"php":"8.0.30","version":"3.57.1","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"at_least_single_space"},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":{"only_dec_inc":true},"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"attribute_placement":"ignore","on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"tests\/unit\/controller\/OfrepApiTest.php":"ffc7e3ab94b4c58eb9b413fef1bef9de","tests\/unit\/GoFeatureFlagProviderTest.php":"062d381339c3bb95bd08b9fa05d1462a","tests\/TestCase.php":"efc0a05509f7101e640d29ec146c0aff","src\/util\/Validator.php":"9732fd68e5ebbac5b3139995077ce8de","src\/config\/Config.php":"eb1e5935642272c77c474adcbbcb18dd","src\/controller\/OfrepApi.php":"2c01a1ada0d53bb066b8c910d0d0de7d","src\/GoFeatureFlagProvider.php":"5dd7f706ef1705395a1f881b90744736","src\/model\/OfrepApiResponse.php":"b34e7d13b252e0c6a722dbaefcbf2862","src\/exception\/RateLimitedException.php":"09d2000c11a7ac0fd523c4d1f52d2f7c","src\/exception\/BaseGoffException.php":"4c7285b637c8ad99d1adcae77a823dd7","src\/exception\/UnknownOfrepException.php":"418a19d2eedd16d46712c524a3f49183","src\/exception\/BaseOfrepException.php":"272845dff81eba1807364a76ae2059d8","src\/exception\/UnauthorizedException.php":"07831e991ffb4fcd213c20a47de8d412","src\/exception\/InvalidConfigException.php":"9f3bf6f27ac4ba2b95e993cf0f45e636","src\/exception\/ParseException.php":"b641c7a21d0c498616bd904a1e0b0745","src\/exception\/InvalidContextException.php":"48cb0b86fa5fb2094a55fb058a5fb176","src\/exception\/FlagNotFoundException.php":"5ab85e04a92c770a86c5a4d0afb69292"}}

‎providers/GoFeatureFlag/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $api->setProvider($provider);
6262
$client = $api->getClient();
6363
$evaluationContext = new MutableEvaluationContext(
6464
"214b796a-807b-4697-b3a3-42de0ec10a37",
65-
new Attributes(["email" => "[email protected]"])
65+
new Attributes(["email" => '[email protected]'])
6666
);
6767

6868
$value = $client->getBooleanDetails('integer_key', false, $evaluationContext);

‎providers/GoFeatureFlag/src/GoFeatureFlagProvider.php

+28-15
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
namespace OpenFeature\Providers\GoFeatureFlag;
66

7+
use OpenFeature\Providers\GoFeatureFlag\config\Config;
8+
use OpenFeature\Providers\GoFeatureFlag\controller\OfrepApi;
9+
use OpenFeature\Providers\GoFeatureFlag\exception\BaseOfrepException;
10+
use OpenFeature\Providers\GoFeatureFlag\exception\InvalidConfigException;
11+
use OpenFeature\Providers\GoFeatureFlag\util\Validator;
712
use OpenFeature\implementation\common\Metadata;
813
use OpenFeature\implementation\provider\AbstractProvider;
914
use OpenFeature\implementation\provider\ResolutionDetailsBuilder;
@@ -13,15 +18,16 @@
1318
use OpenFeature\interfaces\provider\Provider;
1419
use OpenFeature\interfaces\provider\Reason;
1520
use OpenFeature\interfaces\provider\ResolutionDetails;
16-
use OpenFeature\Providers\GoFeatureFlag\config\Config;
17-
use OpenFeature\Providers\GoFeatureFlag\controller\OfrepApi;
18-
use OpenFeature\Providers\GoFeatureFlag\exception\BaseOfrepException;
19-
use OpenFeature\Providers\GoFeatureFlag\exception\InvalidConfigException;
20-
use OpenFeature\Providers\GoFeatureFlag\util\Validator;
21+
use Throwable;
22+
23+
use function array_key_exists;
24+
use function gettype;
25+
use function implode;
26+
use function is_array;
2127

2228
class GoFeatureFlagProvider extends AbstractProvider implements Provider
2329
{
24-
protected static string $CLIENT_NAME = 'GO Feature Flag Provider';
30+
protected static string $NAME = 'GO Feature Flag Provider';
2531
private OfrepApi $ofrepApi;
2632

2733
/**
@@ -30,15 +36,15 @@ class GoFeatureFlagProvider extends AbstractProvider implements Provider
3036
public function __construct(Config $config)
3137
{
3238
Validator::validateConfig($config);
33-
if (is_array($config->getCustomHeaders()) && !array_key_exists("Content-Type", $config->getCustomHeaders())) {
34-
$config->getCustomHeaders()["Content-Type"] = "application/json";
39+
if (is_array($config->getCustomHeaders()) && !array_key_exists('Content-Type', $config->getCustomHeaders())) {
40+
$config->getCustomHeaders()['Content-Type'] = 'application/json';
3541
}
3642
$this->ofrepApi = new OfrepApi($config);
3743
}
3844

3945
public function getMetadata(): Metadata
4046
{
41-
return new Metadata(self::$CLIENT_NAME);
47+
return new Metadata(static::$NAME);
4248
}
4349

4450
public function resolveBooleanValue(string $flagKey, bool $defaultValue, ?EvaluationContext $context = null): ResolutionDetails
@@ -49,7 +55,7 @@ public function resolveBooleanValue(string $flagKey, bool $defaultValue, ?Evalua
4955
/**
5056
* @param array<string> $allowedClasses
5157
*/
52-
private function evaluate(string $flagKey, mixed $defaultValue, array $allowedClasses, EvaluationContext $evaluationContext = null): ResolutionDetails
58+
private function evaluate(string $flagKey, mixed $defaultValue, array $allowedClasses, ?EvaluationContext $evaluationContext = null): ResolutionDetails
5359
{
5460
try {
5561
Validator::validateEvaluationContext($evaluationContext);
@@ -60,8 +66,9 @@ private function evaluate(string $flagKey, mixed $defaultValue, array $allowedCl
6066
if ($apiResp->isError()) {
6167
$err = new ResolutionError(
6268
$apiResp->getErrorCode() ?? ErrorCode::GENERAL(),
63-
$apiResp->getErrorDetails()
69+
$apiResp->getErrorDetails(),
6470
);
71+
6572
return (new ResolutionDetailsBuilder())
6673
->withValue($defaultValue)
6774
->withError($err)
@@ -74,39 +81,45 @@ private function evaluate(string $flagKey, mixed $defaultValue, array $allowedCl
7481
->withReason(Reason::ERROR)
7582
->withError(new ResolutionError(
7683
ErrorCode::TYPE_MISMATCH(),
77-
"Invalid type for $flagKey, got " . gettype($apiResp->getValue()) . " expected " . implode(", ", $allowedClasses)))
84+
"Invalid type for $flagKey, got " . gettype($apiResp->getValue()) . ' expected ' . implode(', ', $allowedClasses),
85+
))
7886
->withValue($defaultValue)
7987
->build();
8088
}
89+
8190
return (new ResolutionDetailsBuilder())
8291
->withValue($apiResp->getValue())
8392
->withReason($apiResp->getReason())
8493
->withVariant($apiResp->getVariant())
8594
->build();
86-
8795
} catch (BaseOfrepException $e) {
8896
$err = new ResolutionError($e->getErrorCode(), $e->getMessage());
97+
8998
return (new ResolutionDetailsBuilder())
9099
->withValue($defaultValue)
91100
->withError($err)
92101
->withReason(Reason::ERROR)
93102
->build();
94-
} catch (\Exception $e) {
103+
} catch (Throwable $e) {
95104
return (new ResolutionDetailsBuilder())
96105
->withValue($defaultValue)
97-
->withError(new ResolutionError(ErrorCode::GENERAL(), "An error occurred while evaluating the flag: " . $e->getMessage()))
106+
->withError(new ResolutionError(ErrorCode::GENERAL(), 'An error occurred while evaluating the flag: ' . $e->getMessage()))
98107
->withReason(Reason::ERROR)
99108
->build();
100109
}
101110
}
102111

112+
/**
113+
* @param array<string> $allowedClasses
114+
*/
103115
private function isValidType(mixed $value, array $allowedClasses): bool
104116
{
105117
foreach ($allowedClasses as $class) {
106118
if ($value instanceof $class || gettype($value) === $class) {
107119
return true;
108120
}
109121
}
122+
110123
return false;
111124
}
112125

‎providers/GoFeatureFlag/src/config/Config.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
class Config
88
{
99
private string $endpoint;
10+
/**
11+
* @var array<string, string>
12+
*/
1013
private array $customHeaders = [];
1114

12-
public function __construct(string $endpoint, ?string $apiKey = '', ?array $custom_headers = [])
15+
public function __construct(string $endpoint, ?string $apiKey = '', ?array $customHeaders = [])
1316
{
1417
$this->endpoint = $endpoint;
15-
$this->customHeaders = $custom_headers;
18+
$this->customHeaders = $customHeaders;
1619
if ($apiKey !== null && $apiKey !== '') {
1720
$this->customHeaders['Authorization'] = 'Bearer ' . $apiKey;
1821
}
1922
}
2023

21-
/**
22-
* @return string
23-
*/
2424
public function getEndpoint(): string
2525
{
2626
return $this->endpoint;
2727
}
2828

2929
/**
30-
* @return array
30+
* @return array<string, string>
3131
*/
3232
public function getCustomHeaders(): array
3333
{

‎providers/GoFeatureFlag/src/controller/OfrepApi.php

+20-9
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
namespace OpenFeature\Providers\GoFeatureFlag\controller;
66

7-
use Exception;
87
use GuzzleHttp\Client;
98
use GuzzleHttp\Exception\GuzzleException;
10-
use OpenFeature\interfaces\flags\EvaluationContext;
119
use OpenFeature\Providers\GoFeatureFlag\config\Config;
1210
use OpenFeature\Providers\GoFeatureFlag\exception\BaseOfrepException;
1311
use OpenFeature\Providers\GoFeatureFlag\exception\FlagNotFoundException;
@@ -16,7 +14,17 @@
1614
use OpenFeature\Providers\GoFeatureFlag\exception\UnauthorizedException;
1715
use OpenFeature\Providers\GoFeatureFlag\exception\UnknownOfrepException;
1816
use OpenFeature\Providers\GoFeatureFlag\model\OfrepApiResponse;
17+
use OpenFeature\interfaces\flags\EvaluationContext;
1918
use Psr\Http\Message\ResponseInterface;
19+
use Throwable;
20+
21+
use function array_merge;
22+
use function is_numeric;
23+
use function json_decode;
24+
use function json_encode;
25+
use function rtrim;
26+
use function strtotime;
27+
use function time;
2028

2129
class OfrepApi
2230
{
@@ -51,10 +59,10 @@ public function evaluate(string $flagKey, EvaluationContext $evaluationContext):
5159
}
5260
}
5361

54-
$base_uri = $this->options->getEndpoint();
55-
$evaluateApiPath = rtrim($base_uri, '/') . "/ofrep/v1/evaluate/flags/{$flagKey}";
62+
$baseUri = $this->options->getEndpoint();
63+
$evaluateApiPath = rtrim($baseUri, '/') . "/ofrep/v1/evaluate/flags/{$flagKey}";
5664
$headers = [
57-
'Content-Type' => 'application/json'
65+
'Content-Type' => 'application/json',
5866
];
5967

6068
if ($this->options->getCustomHeaders() !== null) {
@@ -63,13 +71,13 @@ public function evaluate(string $flagKey, EvaluationContext $evaluationContext):
6371

6472
$fields = array_merge(
6573
$evaluationContext->getAttributes()->toArray(),
66-
['targetingKey' => $evaluationContext->getTargetingKey()]
74+
['targetingKey' => $evaluationContext->getTargetingKey()],
6775
);
6876

6977
$requestBody = json_encode(['context' => $fields]);
7078
$response = $this->client->post($evaluateApiPath, [
7179
'headers' => $headers,
72-
'body' => $requestBody
80+
'body' => $requestBody,
7381
]);
7482

7583
switch ($response->getStatusCode()) {
@@ -84,13 +92,14 @@ public function evaluate(string $flagKey, EvaluationContext $evaluationContext):
8492
throw new FlagNotFoundException($flagKey, $response);
8593
case 429:
8694
$this->parseRetryLaterHeader($response);
95+
8796
throw new RateLimitedException($response);
8897
default:
8998
throw new UnknownOfrepException($response);
9099
}
91100
} catch (BaseOfrepException $e) {
92101
throw $e;
93-
} catch (GuzzleException|Exception $e) {
102+
} catch (GuzzleException | Throwable $e) {
94103
throw new UnknownOfrepException(null, $e);
95104
}
96105
}
@@ -101,6 +110,7 @@ public function evaluate(string $flagKey, EvaluationContext $evaluationContext):
101110
private function parseSuccessResponse(ResponseInterface $response): OfrepApiResponse
102111
{
103112
$parsed = json_decode($response->getBody()->getContents(), true);
113+
104114
return OfrepApiResponse::createSuccessResponse($parsed);
105115
}
106116

@@ -110,6 +120,7 @@ private function parseSuccessResponse(ResponseInterface $response): OfrepApiResp
110120
private function parseErrorResponse(ResponseInterface $response): OfrepApiResponse
111121
{
112122
$parsed = json_decode($response->getBody()->getContents(), true);
123+
113124
return OfrepApiResponse::createErrorResponse($parsed);
114125
}
115126

@@ -119,7 +130,7 @@ private function parseRetryLaterHeader(ResponseInterface $response): void
119130
if ($retryAfterHeader) {
120131
if (is_numeric($retryAfterHeader)) {
121132
// Retry-After is in seconds
122-
$this->retryAfter = time() + (int)$retryAfterHeader;
133+
$this->retryAfter = time() + (int) $retryAfterHeader;
123134
} else {
124135
// Retry-After is in HTTP-date format
125136
$this->retryAfter = strtotime($retryAfterHeader);

‎providers/GoFeatureFlag/src/exception/BaseGoffException.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44

55
namespace OpenFeature\Providers\GoFeatureFlag\exception;
66

7+
use Exception;
78
use OpenFeature\interfaces\provider\ErrorCode;
89
use Psr\Http\Message\ResponseInterface;
10+
use Throwable;
911

10-
abstract class BaseGoffException extends \Exception
12+
abstract class BaseGoffException extends Exception
1113
{
1214
private string $customMessage;
1315
private ?ResponseInterface $response;
1416
private ErrorCode $errorCode;
1517

16-
public function __construct(string $message, ErrorCode $errorCode, ?ResponseInterface $response, int $code = 0, \Exception $previous = null)
18+
public function __construct(string $message, ErrorCode $errorCode, ?ResponseInterface $response, int $code = 0, ?Throwable $previous = null)
1719
{
1820
$this->customMessage = $message;
1921
$this->response = $response;
@@ -35,4 +37,4 @@ public function getErrorCode(): ErrorCode
3537
{
3638
return $this->errorCode;
3739
}
38-
}
40+
}

‎providers/GoFeatureFlag/src/exception/BaseOfrepException.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44

55
namespace OpenFeature\Providers\GoFeatureFlag\exception;
66

7+
use Exception;
78
use OpenFeature\interfaces\provider\ErrorCode;
89
use Psr\Http\Message\ResponseInterface;
10+
use Throwable;
911

10-
abstract class BaseOfrepException extends \Exception
12+
abstract class BaseOfrepException extends Exception
1113
{
1214
private string $customMessage;
1315
private ?ResponseInterface $response;
1416
private ErrorCode $errorCode;
1517

16-
public function __construct(string $message, ErrorCode $errorCode, ?ResponseInterface $response, int $code = 0, \Exception $previous = null)
18+
public function __construct(string $message, ErrorCode $errorCode, ?ResponseInterface $response, int $code = 0, ?Throwable $previous = null)
1719
{
1820
$this->customMessage = $message;
1921
$this->response = $response;
@@ -31,11 +33,8 @@ public function getResponse(): ?ResponseInterface
3133
return $this->response;
3234
}
3335

34-
/**
35-
* @return ErrorCode
36-
*/
3736
public function getErrorCode(): ErrorCode
3837
{
3938
return $this->errorCode;
4039
}
41-
}
40+
}

‎providers/GoFeatureFlag/src/exception/FlagNotFoundException.php

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace OpenFeature\Providers\GoFeatureFlag\exception;
46

57
use OpenFeature\interfaces\provider\ErrorCode;

‎providers/GoFeatureFlag/src/exception/InvalidConfigException.php

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace OpenFeature\Providers\GoFeatureFlag\exception;
46

5-
class InvalidConfigException extends \Exception
7+
use Exception;
8+
use Throwable;
9+
10+
class InvalidConfigException extends Exception
611
{
712
private string $customMessage;
813

9-
public function __construct(string $message, int $code = 0, \Exception $previous = null)
14+
public function __construct(string $message, int $code = 0, ?Throwable $previous = null)
1015
{
1116
$this->customMessage = $message;
1217
parent::__construct($message, $code, $previous);
@@ -16,4 +21,4 @@ public function getCustomMessage(): string
1621
{
1722
return $this->customMessage;
1823
}
19-
}
24+
}

‎providers/GoFeatureFlag/src/exception/InvalidContextException.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace OpenFeature\Providers\GoFeatureFlag\exception;
46

57
use OpenFeature\interfaces\provider\ErrorCode;
68

79
class InvalidContextException extends BaseOfrepException
810
{
9-
1011
public function __construct(string $message)
1112
{
1213
$code = 1006;

‎providers/GoFeatureFlag/src/exception/ParseException.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace OpenFeature\Providers\GoFeatureFlag\exception;
46

57
use OpenFeature\interfaces\provider\ErrorCode;
8+
use Throwable;
69

710
class ParseException extends BaseOfrepException
811
{
9-
public function __construct(string $message, \Exception $previous = null)
12+
public function __construct(string $message, ?Throwable $previous = null)
1013
{
1114
$code = 1005;
1215
parent::__construct($message, ErrorCode::PARSE_ERROR(), null, $code, $previous);

0 commit comments

Comments
 (0)