Skip to content

Commit b502cd6

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #756 from php-api-clients/GitHubEnterpriseCloud/from-1.1.4-64807339d76b70126531bad7791aa05d-from-1.1.4-64807339d76b70126531bad7791aa05d
2 parents 13edfc3 + 1dd34df commit b502cd6

File tree

8 files changed

+95
-624
lines changed

8 files changed

+95
-624
lines changed

‎clients/GitHubEnterpriseCloud/etc/openapi-client-generator.state‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"specHash": "b091080a69743dee86f2fe208c7f1f91",
2+
"specHash": "64807339d76b70126531bad7791aa05d",
33
"generatedFiles": {
44
"files": [
55
{
@@ -6108,7 +6108,7 @@
61086108
},
61096109
{
61106110
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/Actions.php",
6111-
"hash": "c65e85a2b6dcbd28bd791f4fe592a225"
6111+
"hash": "c1d419c64b6f133d64141d359067907f"
61126112
},
61136113
{
61146114
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/AnnouncementBanners.php",
@@ -6156,7 +6156,7 @@
61566156
},
61576157
{
61586158
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/Orgs.php",
6159-
"hash": "a4381768ac529d75c4560fb1a13309b1"
6159+
"hash": "0be8a48857c6ebc56dde6b136d0a42bd"
61606160
},
61616161
{
61626162
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/Oidc.php",
@@ -6188,7 +6188,7 @@
61886188
},
61896189
{
61906190
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/Repos.php",
6191-
"hash": "f1e7b7824b97c730c9552a1138f33019"
6191+
"hash": "19f82f6d3644bb2d40e239b4320f5a9f"
61926192
},
61936193
{
61946194
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Operation\/Reactions.php",
@@ -14004,19 +14004,15 @@
1400414004
},
1400514005
{
1400614006
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Schema\/CopilotSeatDetails.php",
14007-
"hash": "4280606f5f22c09da75eb683a662ee80"
14007+
"hash": "fce07c4b35302f45fa5885cf9994c7b2"
1400814008
},
1400914009
{
1401014010
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Schema\/Organization\/Plan.php",
1401114011
"hash": "b144158b8c6c23d002714b602059581c"
1401214012
},
14013-
{
14014-
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Schema\/CopilotSeatDetails\/Assignee.php",
14015-
"hash": "0f11e0f87cfe34ebdaa4c0b92f506e6a"
14016-
},
1401714013
{
1401814014
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Schema\/Operations\/Copilot\/ListCopilotSeats\/Response\/ApplicationJson\/Ok.php",
14019-
"hash": "0fd9e2bb65915a6b09ddb53fb3e732c4"
14015+
"hash": "ba2dc87545d15504c7354c94c9e43780"
1402014016
},
1402114017
{
1402214018
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Schema\/Copilot\/AddCopilotForBusinessSeatsForTeams\/Request\/ApplicationJson.php",
@@ -29444,7 +29440,7 @@
2944429440
},
2944529441
{
2944629442
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Hydrator\/Operation\/Orgs\/Org\/Members\/Username\/Copilot.php",
29447-
"hash": "8e07375bab60fbb07c8340851bc9484f"
29443+
"hash": "05fa33a84cb20743b3fe7de59b7b0ddf"
2944829444
},
2944929445
{
2945029446
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Hydrator\/Operation\/Orgs\/Org\/Memberships\/Username.php",
@@ -31048,7 +31044,7 @@
3104831044
},
3104931045
{
3105031046
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Hydrators.php",
31051-
"hash": "3251a2b1b63af971494636ae41f881bf"
31047+
"hash": "de8d1ca133b9c7aa79f8aa7776a1cccb"
3105231048
},
3105331049
{
3105431050
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Operation\/EnterpriseAdmin\/ListProvisionedGroupsEnterprise.php",
@@ -31509,6 +31505,10 @@
3150931505
{
3151031506
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Hydrator\/Operation\/Repos\/Owner\/Repo\/Actions\/Runs\/RunId\/ForceCancel.php",
3151131507
"hash": "56f3feab7e2688ad0dab07b5f7de468a"
31508+
},
31509+
{
31510+
"name": ".\/clients\/GitHubEnterpriseCloud\/etc\/..\/\/src\/\/Internal\/Attribute\/CastUnionToType\/Schema\/CopilotSeatDetails\/Assignee.php",
31511+
"hash": "23a28307668db2b48df10922e4d7d665"
3151231512
}
3151331513
]
3151431514
},

‎clients/GitHubEnterpriseCloud/src/Internal/Attribute/CastUnionToType/Schema/CopilotSeatDetails/Assignee.php‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace ApiClients\Client\GitHubEnterpriseCloud\Internal\Attribute\CastUnionToType\Schema\CopilotSeatDetails;
6+
7+
use ApiClients\Client\GitHubEnterpriseCloud\Schema;
8+
use Attribute;
9+
use EventSauce\ObjectHydrator\ObjectMapper;
10+
use EventSauce\ObjectHydrator\PropertyCaster;
11+
use Throwable;
12+
13+
use function array_keys;
14+
use function array_unique;
15+
use function implode;
16+
use function is_array;
17+
use function sort;
18+
19+
#[Attribute(Attribute::TARGET_PARAMETER)]
20+
final class Assignee implements PropertyCaster
21+
{
22+
public function cast(mixed $value, ObjectMapper $hydrator): mixed
23+
{
24+
if (is_array($value)) {
25+
$signatureChunks = array_unique(array_keys($value));
26+
sort($signatureChunks);
27+
$signature = implode('|', $signatureChunks);
28+
if ($signature === 'name|email|login|id|node_id|avatar_url|gravatar_id|url|html_url|followers_url|following_url|gists_url|starred_url|subscriptions_url|organizations_url|repos_url|events_url|received_events_url|type|site_admin|starred_at') {
29+
try {
30+
return $hydrator->hydrateObject(Schema\SimpleUser::class, $value);
31+
} catch (Throwable) {
32+
}
33+
}
34+
35+
if ($signature === 'id|node_id|name|slug|description|privacy|notification_setting|permission|permissions|url|html_url|members_url|repositories_url|parent') {
36+
try {
37+
return $hydrator->hydrateObject(Schema\Team::class, $value);
38+
} catch (Throwable) {
39+
}
40+
}
41+
42+
if ($signature === 'login|url|id|node_id|repos_url|events_url|hooks_url|issues_url|members_url|public_members_url|avatar_url|description|blog|html_url|name|company|location|email|has_organization_projects|has_repository_projects|is_verified|public_repos|public_gists|followers|following|type|created_at|updated_at|plan') {
43+
try {
44+
return $hydrator->hydrateObject(Schema\Organization::class, $value);
45+
} catch (Throwable) {
46+
}
47+
}
48+
}
49+
50+
return $value;
51+
}
52+
}

‎clients/GitHubEnterpriseCloud/src/Internal/Hydrator/Operation/Orgs/Org/Members/Username/Copilot.php‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace ApiClients\Client\GitHubEnterpriseCloud\Internal\Hydrator\Operation\Orgs\Org\Members\Username;
66

7+
use ApiClients\Client\GitHubEnterpriseCloud\Internal\Attribute\CastUnionToType\Schema\CopilotSeatDetails\Assignee;
78
use ApiClients\Client\GitHubEnterpriseCloud\Internal\Attribute\CastUnionToType\Schema\CopilotSeatDetails\AssigningTeam;
89
use ApiClients\Client\GitHubEnterpriseCloud\Schema\BasicError;
910
use ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails;
10-
use ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails\Assignee;
1111
use ApiClients\Client\GitHubEnterpriseCloud\Schema\Team;
1212
use ApiClients\Client\GitHubEnterpriseCloud\Schema\Team\Permissions;
1313
use ApiClients\Client\GitHubEnterpriseCloud\Schema\TeamSimple;
@@ -48,7 +48,6 @@ public function hydrateObject(string $className, array $payload): object
4848
return match ($className) {
4949
'ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️CopilotSeatDetails($payload),
5050
'ApiClients\Client\GitHubEnterpriseCloud\Schema\BasicError' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️BasicError($payload),
51-
'ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails\Assignee' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️CopilotSeatDetails⚡️Assignee($payload),
5251
'ApiClients\Client\GitHubEnterpriseCloud\Schema\Team' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️Team($payload),
5352
'ApiClients\Client\GitHubEnterpriseCloud\Schema\Team\Permissions' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️Team⚡️Permissions($payload),
5453
'ApiClients\Client\GitHubEnterpriseCloud\Schema\TeamSimple' => $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️TeamSimple($payload),
@@ -68,13 +67,17 @@ private function hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️S
6867
goto after_assignee;
6968
}
7069

71-
if (is_array($value)) {
72-
try {
73-
$this->hydrationStack[] = 'assignee';
74-
$value = $this->hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️CopilotSeatDetails⚡️Assignee($value);
75-
} finally {
76-
array_pop($this->hydrationStack);
77-
}
70+
static $assigneeCaster1;
71+
72+
if ($assigneeCaster1 === null) {
73+
$assigneeCaster1 = new Assignee(...[]);
74+
}
75+
76+
$value = $assigneeCaster1->cast($value, $this);
77+
78+
if ($value === null) {
79+
$missingFields[] = 'assignee';
80+
goto after_assignee;
7881
}
7982

8083
$properties['assignee'] = $value;
@@ -246,26 +249,6 @@ private function hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️S
246249
}
247250
}
248251

249-
private function hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️CopilotSeatDetails⚡️Assignee(array $payload): Assignee
250-
{
251-
$properties = [];
252-
$missingFields = [];
253-
try {
254-
} catch (Throwable $exception) {
255-
throw UnableToHydrateObject::dueToError('ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails\Assignee', $exception, stack: $this->hydrationStack);
256-
}
257-
258-
if (count($missingFields) > 0) {
259-
throw UnableToHydrateObject::dueToMissingFields(Assignee::class, $missingFields, stack: $this->hydrationStack);
260-
}
261-
262-
try {
263-
return new Assignee(...$properties);
264-
} catch (Throwable $exception) {
265-
throw UnableToHydrateObject::dueToError('ApiClients\Client\GitHubEnterpriseCloud\Schema\CopilotSeatDetails\Assignee', $exception, stack: $this->hydrationStack);
266-
}
267-
}
268-
269252
private function hydrateApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️Team(array $payload): Team
270253
{
271254
$properties = [];
@@ -793,8 +776,12 @@ private function serializeObjectApiClients⚡️Client⚡️GitHubEnterpriseClou
793776
assert($object instanceof CopilotSeatDetails);
794777
$result = [];
795778

796-
$assignee = $object->assignee;
797-
$assignee = $this->serializeObjectApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️CopilotSeatDetails⚡️Assignee($assignee);
779+
$assignee = $object->assignee;
780+
$assignee = match ($assignee::class) {
781+
'ApiClients\Client\GitHubEnterpriseCloud\Schema\SimpleUser' => $this->serializeObjectApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️SimpleUser($assignee),
782+
'ApiClients\Client\GitHubEnterpriseCloud\Schema\Team' => $this->serializeObjectApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️Team($assignee),
783+
'ApiClients\Client\GitHubEnterpriseCloud\Schema\Organization' => $this->serializeObjectApiClients⚡️Client⚡️GitHubEnterpriseCloud⚡️Schema⚡️Organization($assignee),
784+
};
798785
after_assignee: $result['assignee'] = $assignee;
799786

800787
$assigningTeam = $object->assigningTeam;

‎clients/GitHubEnterpriseCloud/src/Internal/Hydrators.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ public function hydrateObject(string $className, array $payload): object
758758
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Codespaces\\GetCodespacesForUserInOrg\\Response\\ApplicationJson\\Ok\\Application\\Json' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces()->hydrateObject($className, $payload),
759759
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Codespaces\\DeleteFromOrganization\\Response\\ApplicationJson\\Accepted\\Application\\Json' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces🌀CodespaceName()->hydrateObject($className, $payload),
760760
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CodespaceMachine', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace\\GitStatus', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace\\RuntimeConstraints' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces🌀CodespaceName🌀Stop()->hydrateObject($className, $payload),
761-
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails\\Assignee' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Copilot()->hydrateObject($className, $payload),
761+
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Copilot()->hydrateObject($className, $payload),
762762
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrgMembership', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrganizationSimple', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrgMembership\\Permissions' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Memberships🌀Username()->hydrateObject($className, $payload),
763763
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Migration' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Migrations()->hydrateObject($className, $payload),
764764
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Orgs\\ConvertMemberToOutsideCollaborator\\Response\\ApplicationJson\\Accepted\\Application\\Json', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Orgs\\RemoveOutsideCollaborator\\Response\\ApplicationJson\\UnprocessableEntity' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀OutsideCollaborators🌀Username()->hydrateObject($className, $payload),
@@ -1043,7 +1043,7 @@ public function serializeObjectOfType(object $object, string $className): mixed
10431043
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Codespaces\\GetCodespacesForUserInOrg\\Response\\ApplicationJson\\Ok\\Application\\Json' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces()->serializeObject($object),
10441044
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Codespaces\\DeleteFromOrganization\\Response\\ApplicationJson\\Accepted\\Application\\Json' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces🌀CodespaceName()->serializeObject($object),
10451045
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CodespaceMachine', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace\\GitStatus', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Codespace\\RuntimeConstraints' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Codespaces🌀CodespaceName🌀Stop()->serializeObject($object),
1046-
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails\\Assignee' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Copilot()->serializeObject($object),
1046+
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\CopilotSeatDetails' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Members🌀Username🌀Copilot()->serializeObject($object),
10471047
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrgMembership', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrganizationSimple', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\OrgMembership\\Permissions' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Memberships🌀Username()->serializeObject($object),
10481048
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Migration' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀Migrations()->serializeObject($object),
10491049
'\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Orgs\\ConvertMemberToOutsideCollaborator\\Response\\ApplicationJson\\Accepted\\Application\\Json', '\\ApiClients\\Client\\GitHubEnterpriseCloud\\Schema\\Operations\\Orgs\\RemoveOutsideCollaborator\\Response\\ApplicationJson\\UnprocessableEntity' => $this->getObjectMapperOperation🌀Orgs🌀Org🌀OutsideCollaborators🌀Username()->serializeObject($object),

‎clients/GitHubEnterpriseCloud/src/Schema/CopilotSeatDetails.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace ApiClients\Client\GitHubEnterpriseCloud\Schema;
66

7+
use ApiClients\Client\GitHubEnterpriseCloud\Internal\Attribute\CastUnionToType\Schema\CopilotSeatDetails\Assignee;
78
use ApiClients\Client\GitHubEnterpriseCloud\Internal\Attribute\CastUnionToType\Schema\CopilotSeatDetails\AssigningTeam;
89
use ApiClients\Client\GitHubEnterpriseCloud\Schema;
910
use EventSauce\ObjectHydrator\MapFrom;
@@ -19,7 +20,8 @@
1920
"type": "object",
2021
"properties": {
2122
"assignee": {
22-
"enum": [
23+
"type": "object",
24+
"oneOf": [
2325
{
2426
"title": "Simple User",
2527
"required": [
@@ -568,7 +570,6 @@
568570
"description": "GitHub account for managing multiple users, teams, and repositories"
569571
}
570572
],
571-
"type": "object",
572573
"description": "The assignee that has been granted access to GitHub Copilot.",
573574
"additionalProperties": true
574575
},
@@ -831,7 +832,7 @@
831832
public const SCHEMA_TITLE = 'Copilot for Business Seat Detail';
832833
public const SCHEMA_DESCRIPTION = 'Information about a Copilot for Business seat assignment for a user, team, or organization.';
833834
public const SCHEMA_EXAMPLE_DATA = '{
834-
"assignee": [],
835+
"assignee": null,
835836
"assigning_team": null,
836837
"pending_cancellation_date": "generated",
837838
"last_activity_at": "1970-01-01T00:00:00+00:00",
@@ -849,7 +850,8 @@
849850
* createdAt: Timestamp of when the assignee was last granted access to GitHub Copilot, in ISO 8601 format.
850851
* updatedAt: Timestamp of when the assignee's GitHub Copilot access was last updated, in ISO 8601 format.
851852
*/
852-
public function __construct(public Schema\CopilotSeatDetails\Assignee $assignee, #[MapFrom('assigning_team')]
853+
public function __construct(#[Assignee]
854+
public Schema\SimpleUser|Schema\Team|Schema\Organization $assignee, #[MapFrom('assigning_team')]
853855
#[AssigningTeam]
854856
public Schema\Team|null $assigningTeam, #[MapFrom('pending_cancellation_date')]
855857
public string|null $pendingCancellationDate, #[MapFrom('last_activity_at')]

0 commit comments

Comments
 (0)