Skip to content

Commit 05ae873

Browse files
dcarbonedcarbone
committed
cs-fixer run
1 parent 353f8eb commit 05ae873

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+379
-426
lines changed

‎src/ACL/ACLAuthMethod.php‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,32 @@
2727
*/
2828
class ACLAuthMethod extends AbstractModel
2929
{
30+
protected const FIELDS = [
31+
self::FIELD_DISPLAY_NAME => [
32+
Hydration::FIELD_TYPE => Hydration::STRING,
33+
Hydration::FIELD_NULLABLE => true,
34+
],
35+
self::FIELD_DESCRIPTION => [
36+
Hydration::FIELD_TYPE => Hydration::STRING,
37+
Hydration::FIELD_NULLABLE => true,
38+
],
39+
self::FIELD_MAX_TOKEN_TTL => [
40+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_DURATION,
41+
],
42+
self::FIELD_TOKEN_LOCALITY => [
43+
Hydration::FIELD_TYPE => Hydration::STRING,
44+
Hydration::FIELD_NULLABLE => true,
45+
],
46+
self::FIELD_NAMESPACE_RULES => [
47+
Hydration::FIELD_TYPE => Hydration::ARRAY,
48+
Hydration::FIELD_CLASS => ACLAuthMethodNamespaceRule::class,
49+
Hydration::FIELD_ARRAY_TYPE => Hydration::class,
50+
],
51+
self::FIELD_NAMESPACE => [
52+
Hydration::FIELD_TYPE => Hydration::STRING,
53+
Hydration::FIELD_NULLABLE => true,
54+
],
55+
];
3056
private const FIELD_DISPLAY_NAME = 'DisplayName';
3157
private const FIELD_DESCRIPTION = 'Description';
3258
private const FIELD_MAX_TOKEN_TTL = 'MaxTokenTTL';
@@ -57,33 +83,6 @@ class ACLAuthMethod extends AbstractModel
5783
/** @var string|null */
5884
public ?string $Namespace = null;
5985

60-
protected const FIELDS = [
61-
self::FIELD_DISPLAY_NAME => [
62-
Hydration::FIELD_TYPE => Hydration::STRING,
63-
Hydration::FIELD_NULLABLE => true,
64-
],
65-
self::FIELD_DESCRIPTION => [
66-
Hydration::FIELD_TYPE => Hydration::STRING,
67-
Hydration::FIELD_NULLABLE => true,
68-
],
69-
self::FIELD_MAX_TOKEN_TTL => [
70-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_DURATION,
71-
],
72-
self::FIELD_TOKEN_LOCALITY => [
73-
Hydration::FIELD_TYPE => Hydration::STRING,
74-
Hydration::FIELD_NULLABLE => true,
75-
],
76-
self::FIELD_NAMESPACE_RULES => [
77-
Hydration::FIELD_TYPE => Hydration::ARRAY,
78-
Hydration::FIELD_CLASS => ACLAuthMethodNamespaceRule::class,
79-
Hydration::FIELD_ARRAY_TYPE => Hydration::class,
80-
],
81-
self::FIELD_NAMESPACE => [
82-
Hydration::FIELD_TYPE => Hydration::STRING,
83-
Hydration::FIELD_NULLABLE => true,
84-
],
85-
];
86-
8786
/**
8887
* ACLAuthMethod constructor.
8988
* @param array $data

‎src/ACL/ACLAuthMethodListEntry.php‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,20 @@
2626
*/
2727
class ACLAuthMethodListEntry extends AbstractModel
2828
{
29+
protected const FIELDS = [
30+
self::FIELD_DISPLAY_NAME => [
31+
Hydration::FIELD_TYPE => Hydration::STRING,
32+
Hydration::FIELD_NULLABLE => true,
33+
],
34+
self::FIELD_DESCRIPTION => [
35+
Hydration::FIELD_TYPE => Hydration::STRING,
36+
Hydration::FIELD_NULLABLE => true,
37+
],
38+
self::FIELD_NAMESPACE => [
39+
Hydration::FIELD_TYPE => Hydration::STRING,
40+
Hydration::FIELD_NULLABLE => true,
41+
],
42+
];
2943
private const FIELD_DISPLAY_NAME = 'DisplayName';
3044
private const FIELD_DESCRIPTION = 'Description';
3145
private const FIELD_NAMESPACE = 'Namespace';
@@ -45,21 +59,6 @@ class ACLAuthMethodListEntry extends AbstractModel
4559
/** @var string|null */
4660
public ?string $Namespace = null;
4761

48-
protected const FIELDS = [
49-
self::FIELD_DISPLAY_NAME => [
50-
Hydration::FIELD_TYPE => Hydration::STRING,
51-
Hydration::FIELD_NULLABLE => true,
52-
],
53-
self::FIELD_DESCRIPTION => [
54-
Hydration::FIELD_TYPE => Hydration::STRING,
55-
Hydration::FIELD_NULLABLE => true,
56-
],
57-
self::FIELD_NAMESPACE => [
58-
Hydration::FIELD_TYPE => Hydration::STRING,
59-
Hydration::FIELD_NULLABLE => true,
60-
],
61-
];
62-
6362
/**
6463
* @return string
6564
*/

‎src/ACL/ACLBindingRule.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
*/
2727
class ACLBindingRule extends AbstractModel
2828
{
29+
protected const FIELDS = [
30+
self::FIELD_NAMESPACE => [
31+
Hydration::FIELD_TYPE => Hydration::STRING,
32+
Hydration::FIELD_NULLABLE => true,
33+
],
34+
];
2935
private const FIELD_NAMESPACE = 'Namespace';
3036

3137
/** @var string */
@@ -47,13 +53,6 @@ class ACLBindingRule extends AbstractModel
4753
/** @var string|null */
4854
public ?string $Namespace = null;
4955

50-
protected const FIELDS = [
51-
self::FIELD_NAMESPACE => [
52-
Hydration::FIELD_TYPE => Hydration::STRING,
53-
Hydration::FIELD_NULLABLE => true,
54-
],
55-
];
56-
5756
/**
5857
* @return string
5958
*/

‎src/ACL/ACLEntriesResponse.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function getValue(): ?array
3939

4040
/**
4141
* @param mixed $decodedData
42-
* @return void
4342
*/
4443
public function hydrateValue($decodedData): void
4544
{

‎src/ACL/ACLReplicationStatus.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@
2727
*/
2828
class ACLReplicationStatus extends AbstractModel
2929
{
30+
protected const FIELDS = [
31+
self::FIELD_LAST_SUCCESS => [
32+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
33+
],
34+
self::FIELD_LAST_ERROR => [
35+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
36+
],
37+
];
3038
private const FIELD_LAST_SUCCESS = 'LastSuccess';
3139
private const FIELD_LAST_ERROR = 'LastError';
3240

@@ -47,15 +55,6 @@ class ACLReplicationStatus extends AbstractModel
4755
/** @var \DCarbone\Go\Time\Time */
4856
public Time\Time $LastError;
4957

50-
protected const FIELDS = [
51-
self::FIELD_LAST_SUCCESS => [
52-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
53-
],
54-
self::FIELD_LAST_ERROR => [
55-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
56-
],
57-
];
58-
5958
/**
6059
* ACLReplicationStatus constructor.
6160
* @param array $data

‎src/ACL/ACLReplicationStatusResponse.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function getValue(): ?ACLReplicationStatus
3939

4040
/**
4141
* @param mixed $decodedData
42-
* @return void
4342
*/
4443
public function hydrateValue($decodedData): void
4544
{

‎src/ACL/ACLRole.php‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,6 @@
2626
*/
2727
class ACLRole extends AbstractModel
2828
{
29-
private const FIELD_POLICIES = 'Policies';
30-
private const FIELD_ROLES = 'Roles';
31-
private const FIELD_SERVICE_IDENTITIES = 'ServiceIdentities';
32-
private const FIELD_NODE_IDENTITIES = 'NodeIdentities';
33-
private const FIELD_NAMESPACE = 'Namespace';
34-
35-
/** @var string */
36-
public string $ID = '';
37-
/** @var string */
38-
public string $Name = '';
39-
/** @var string */
40-
public string $Description = '';
41-
/** @var \DCarbone\PHPConsulAPI\ACL\ACLRolePolicyLink[] */
42-
public array $Policies = [];
43-
/** @var \DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity[] */
44-
public array $ServiceIdentities = [];
45-
/** @var \DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity[] */
46-
public array $NodeIdentities = [];
47-
/** @var string */
48-
public string $Hash = '';
49-
/** @var int */
50-
public int $CreateIndex = 0;
51-
/** @var int */
52-
public int $ModifyIndex = 0;
53-
/** @var string|null */
54-
public ?string $Namespace = null;
55-
5629
protected const FIELDS = [
5730
self::FIELD_POLICIES => [
5831
Hydration::FIELD_TYPE => Hydration::ARRAY,
@@ -79,6 +52,32 @@ class ACLRole extends AbstractModel
7952
Hydration::FIELD_NULLABLE => true,
8053
],
8154
];
55+
private const FIELD_POLICIES = 'Policies';
56+
private const FIELD_ROLES = 'Roles';
57+
private const FIELD_SERVICE_IDENTITIES = 'ServiceIdentities';
58+
private const FIELD_NODE_IDENTITIES = 'NodeIdentities';
59+
private const FIELD_NAMESPACE = 'Namespace';
60+
61+
/** @var string */
62+
public string $ID = '';
63+
/** @var string */
64+
public string $Name = '';
65+
/** @var string */
66+
public string $Description = '';
67+
/** @var \DCarbone\PHPConsulAPI\ACL\ACLRolePolicyLink[] */
68+
public array $Policies = [];
69+
/** @var \DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity[] */
70+
public array $ServiceIdentities = [];
71+
/** @var \DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity[] */
72+
public array $NodeIdentities = [];
73+
/** @var string */
74+
public string $Hash = '';
75+
/** @var int */
76+
public int $CreateIndex = 0;
77+
/** @var int */
78+
public int $ModifyIndex = 0;
79+
/** @var string|null */
80+
public ?string $Namespace = null;
8281

8382
/**
8483
* @return string

‎src/ACL/ACLToken.php‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,50 @@
2727
*/
2828
class ACLToken extends AbstractModel
2929
{
30+
protected const FIELDS = [
31+
self::FIELD_POLICIES => [
32+
Hydration::FIELD_TYPE => Hydration::ARRAY,
33+
Hydration::FIELD_CLASS => ACLTokenPolicyLink::class,
34+
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
35+
],
36+
self::FIELD_ROLES => [
37+
Hydration::FIELD_TYPE => Hydration::ARRAY,
38+
Hydration::FIELD_CLASS => ACLTokenRoleLink::class,
39+
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
40+
],
41+
self::FIELD_SERVICE_IDENTITIES => [
42+
Hydration::FIELD_TYPE => Hydration::ARRAY,
43+
Hydration::FIELD_CLASS => ACLServiceIdentity::class,
44+
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
45+
],
46+
self::FIELD_NODE_IDENTITIES => [
47+
Hydration::FIELD_TYPE => Hydration::ARRAY,
48+
Hydration::FIELD_CLASS => ACLNodeIdentity::class,
49+
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
50+
],
51+
self::FIELD_AUTH_METHOD => [
52+
Hydration::FIELD_TYPE => Hydration::STRING,
53+
Hydration::FIELD_NULLABLE => true,
54+
],
55+
self::FIELD_EXPIRATION_TTL => [
56+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_DURATION,
57+
],
58+
self::FIELD_EXPIRATION_TIME => [
59+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_NULLABLE_TIME,
60+
Hydration::FIELD_NULLABLE => true,
61+
],
62+
self::FIELD_CREATE_TIME => [
63+
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
64+
],
65+
self::FIELD_RULES => [
66+
Hydration::FIELD_TYPE => Hydration::STRING,
67+
Hydration::FIELD_NULLABLE => true,
68+
],
69+
self::FIELD_NAMESPACE => [
70+
Hydration::FIELD_TYPE => Hydration::STRING,
71+
Hydration::FIELD_NULLABLE => true,
72+
],
73+
];
3074
private const FIELD_POLICIES = 'Policies';
3175
private const FIELD_ROLES = 'Roles';
3276
private const FIELD_SERVICE_IDENTITIES = 'ServiceIdentities';
@@ -77,51 +121,6 @@ class ACLToken extends AbstractModel
77121
*/
78122
public ?string $Rules = null;
79123

80-
protected const FIELDS = [
81-
self::FIELD_POLICIES => [
82-
Hydration::FIELD_TYPE => Hydration::ARRAY,
83-
Hydration::FIELD_CLASS => ACLTokenPolicyLink::class,
84-
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
85-
],
86-
self::FIELD_ROLES => [
87-
Hydration::FIELD_TYPE => Hydration::ARRAY,
88-
Hydration::FIELD_CLASS => ACLTokenRoleLink::class,
89-
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
90-
],
91-
self::FIELD_SERVICE_IDENTITIES => [
92-
Hydration::FIELD_TYPE => Hydration::ARRAY,
93-
Hydration::FIELD_CLASS => ACLServiceIdentity::class,
94-
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
95-
],
96-
self::FIELD_NODE_IDENTITIES => [
97-
Hydration::FIELD_TYPE => Hydration::ARRAY,
98-
Hydration::FIELD_CLASS => ACLNodeIdentity::class,
99-
Hydration::FIELD_ARRAY_TYPE => Hydration::OBJECT,
100-
],
101-
self::FIELD_AUTH_METHOD => [
102-
Hydration::FIELD_TYPE => Hydration::STRING,
103-
Hydration::FIELD_NULLABLE => true,
104-
],
105-
self::FIELD_EXPIRATION_TTL => [
106-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_DURATION,
107-
],
108-
self::FIELD_EXPIRATION_TIME => [
109-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_NULLABLE_TIME,
110-
Hydration::FIELD_NULLABLE => true,
111-
],
112-
self::FIELD_CREATE_TIME => [
113-
Hydration::FIELD_CALLBACK => Hydration::CALLABLE_HYDRATE_TIME,
114-
],
115-
self::FIELD_RULES => [
116-
Hydration::FIELD_TYPE => Hydration::STRING,
117-
Hydration::FIELD_NULLABLE => true,
118-
],
119-
self::FIELD_NAMESPACE => [
120-
Hydration::FIELD_TYPE => Hydration::STRING,
121-
Hydration::FIELD_NULLABLE => true,
122-
],
123-
];
124-
125124
/**
126125
* ACLToken constructor.
127126
* @param array $data

0 commit comments

Comments
 (0)