From 83062008fe8f99d45b4cccd6cc4fe8a1f947768a Mon Sep 17 00:00:00 2001 From: stollr Date: Sat, 13 Jan 2024 18:34:09 +0100 Subject: [PATCH 1/3] Moved group type classes to separate namespace --- docs/out/GroupAPI.md | 8 ++++---- src/Models/Groups/{Group => GroupType}/GroupType.php | 2 +- .../Groups/{Group => GroupType}/GroupTypeRequest.php | 2 +- .../{Group => GroupType}/GroupTypeRequestBuilder.php | 2 +- tests/Integration/Requests/GroupTypeRequestTest.php | 2 +- tests/Unit/Docs/GroupTypeRequestTest.php | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename src/Models/Groups/{Group => GroupType}/GroupType.php (98%) rename src/Models/Groups/{Group => GroupType}/GroupTypeRequest.php (94%) rename src/Models/Groups/{Group => GroupType}/GroupTypeRequestBuilder.php (88%) diff --git a/docs/out/GroupAPI.md b/docs/out/GroupAPI.md index 6cd94137..2394568b 100644 --- a/docs/out/GroupAPI.md +++ b/docs/out/GroupAPI.md @@ -517,8 +517,8 @@ ## Group-Types ```php - use CTApi\Models\Groups\Group\GroupType; - use CTApi\Models\Groups\Group\GroupTypeRequest; + use CTApi\Models\Groups\GroupType\GroupType; + use CTApi\Models\Groups\GroupType\GroupTypeRequest; $groupTypes = GroupTypeRequest::all(); @@ -534,8 +534,8 @@ ``` ```php - use CTApi\Models\Groups\Group\GroupType; - use CTApi\Models\Groups\Group\GroupTypeRequest; + use CTApi\Models\Groups\GroupType\GroupType; + use CTApi\Models\Groups\GroupType\GroupTypeRequest; $groupType = GroupTypeRequest::find(2); diff --git a/src/Models/Groups/Group/GroupType.php b/src/Models/Groups/GroupType/GroupType.php similarity index 98% rename from src/Models/Groups/Group/GroupType.php rename to src/Models/Groups/GroupType/GroupType.php index 7c2dc866..ea470942 100644 --- a/src/Models/Groups/Group/GroupType.php +++ b/src/Models/Groups/GroupType/GroupType.php @@ -1,6 +1,6 @@ Date: Mon, 15 Jan 2024 16:06:09 +0100 Subject: [PATCH 2/3] add pr to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e648d2e..0c6ac179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Retrieve, create and delete SongArrangement comments ([PR187](https://github.com/5pm-HDH/churchtools-api/pull/187)) -- Get GroupTypes ([PR188](https://github.com/5pm-HDH/churchtools-api/pull/188)) +- Get GroupTypes ([PR188](https://github.com/5pm-HDH/churchtools-api/pull/188), [PR198](https://github.com/5pm-HDH/churchtools-api/pull/198)) - Get GroupTypeRoles ([PR197](https://github.com/5pm-HDH/churchtools-api/pull/197)) - PHP coding standard ([PR193](https://github.com/5pm-HDH/churchtools-api/pull/193)) From 1d708c8e04ea05199e103c1c5e9e656e221ce76c Mon Sep 17 00:00:00 2001 From: DumbergerL Date: Mon, 15 Jan 2024 16:10:45 +0100 Subject: [PATCH 3/3] fix import issue --- src/Models/Groups/GroupTypeRole/GroupTypeRole.php | 4 ++-- tests/Integration/Requests/GroupTypeRoleRequestTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Models/Groups/GroupTypeRole/GroupTypeRole.php b/src/Models/Groups/GroupTypeRole/GroupTypeRole.php index 7d0da993..29f6eb12 100644 --- a/src/Models/Groups/GroupTypeRole/GroupTypeRole.php +++ b/src/Models/Groups/GroupTypeRole/GroupTypeRole.php @@ -3,8 +3,8 @@ namespace CTApi\Models\Groups\GroupTypeRole; use CTApi\Models\AbstractModel; -use CTApi\Models\Groups\Group\GroupType; -use CTApi\Models\Groups\Group\GroupTypeRequest; +use CTApi\Models\Groups\GroupType\GroupType; +use CTApi\Models\Groups\GroupType\GroupTypeRequest; use CTApi\Traits\Model\FillWithData; use CTApi\Traits\Model\MetaAttribute; diff --git a/tests/Integration/Requests/GroupTypeRoleRequestTest.php b/tests/Integration/Requests/GroupTypeRoleRequestTest.php index 5c1de31e..1a40eb94 100644 --- a/tests/Integration/Requests/GroupTypeRoleRequestTest.php +++ b/tests/Integration/Requests/GroupTypeRoleRequestTest.php @@ -3,7 +3,7 @@ namespace CTApi\Test\Integration\Requests; use CTApi\CTLog; -use CTApi\Models\Groups\Group\GroupType; +use CTApi\Models\Groups\GroupType\GroupType; use CTApi\Models\Groups\GroupTypeRole\GroupTypeRole; use CTApi\Models\Groups\GroupTypeRole\GroupTypeRoleRequest; use CTApi\Test\Integration\IntegrationTestData;