From a6382fe434cae03455ef3da4d58a014ff4c21512 Mon Sep 17 00:00:00 2001 From: vgrem Date: Sat, 21 Aug 2021 13:40:38 +0300 Subject: [PATCH] Refactorings for OneDrive & Planner APIs --- src/OneDrive/{ => Columns}/LookupColumn.php | 2 +- src/OneDrive/{ => Columns}/NumberColumn.php | 2 +- src/OneDrive/{ => Columns}/PersonOrGroupColumn.php | 2 +- src/OneDrive/{ => DriveItems}/Deleted.php | 2 +- src/OneDrive/{ => DriveItems}/Package.php | 2 +- src/OneDrive/{ => DriveItems}/PublicationFacet.php | 2 +- src/OneDrive/{ => DriveItems}/RemoteItem.php | 5 ++++- src/OneDrive/Drives/Drive.php | 1 - src/OneDrive/{ => Drives}/Quota.php | 2 +- src/OneDrive/{ => ListItems}/FieldValueSet.php | 2 +- src/OneDrive/{ => Shares}/Shared.php | 2 +- src/OneDrive/{ => Shares}/SharedDriveItem.php | 7 ++++++- src/Planner/{ => Plans}/PlannerCategoryDescriptions.php | 2 +- src/Planner/{ => Tasks}/PlannerAppliedCategories.php | 2 +- .../{ => Tasks}/PlannerAssignedToTaskBoardTaskFormat.php | 3 ++- src/Planner/{ => Tasks}/PlannerExternalReference.php | 2 +- src/Planner/{ => Tasks}/PlannerExternalReferences.php | 2 +- src/Planner/Tasks/PlannerTask.php | 2 -- 18 files changed, 25 insertions(+), 19 deletions(-) rename src/OneDrive/{ => Columns}/LookupColumn.php (92%) rename src/OneDrive/{ => Columns}/NumberColumn.php (90%) rename src/OneDrive/{ => Columns}/PersonOrGroupColumn.php (89%) rename src/OneDrive/{ => DriveItems}/Deleted.php (81%) rename src/OneDrive/{ => DriveItems}/Package.php (81%) rename src/OneDrive/{ => DriveItems}/PublicationFacet.php (85%) rename src/OneDrive/{ => DriveItems}/RemoteItem.php (87%) rename src/OneDrive/{ => Drives}/Quota.php (91%) rename src/OneDrive/{ => ListItems}/FieldValueSet.php (74%) rename src/OneDrive/{ => Shares}/Shared.php (90%) rename src/OneDrive/{ => Shares}/SharedDriveItem.php (88%) rename src/Planner/{ => Plans}/PlannerCategoryDescriptions.php (93%) rename src/Planner/{ => Tasks}/PlannerAppliedCategories.php (80%) rename src/Planner/{ => Tasks}/PlannerAssignedToTaskBoardTaskFormat.php (96%) rename src/Planner/{ => Tasks}/PlannerExternalReference.php (92%) rename src/Planner/{ => Tasks}/PlannerExternalReferences.php (80%) diff --git a/src/OneDrive/LookupColumn.php b/src/OneDrive/Columns/LookupColumn.php similarity index 92% rename from src/OneDrive/LookupColumn.php rename to src/OneDrive/Columns/LookupColumn.php index 41648374..fdd1387b 100644 --- a/src/OneDrive/LookupColumn.php +++ b/src/OneDrive/Columns/LookupColumn.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:07:25+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Columns; use Office365\Runtime\ClientValue; class LookupColumn extends ClientValue diff --git a/src/OneDrive/NumberColumn.php b/src/OneDrive/Columns/NumberColumn.php similarity index 90% rename from src/OneDrive/NumberColumn.php rename to src/OneDrive/Columns/NumberColumn.php index ef28dad1..078d3aa0 100644 --- a/src/OneDrive/NumberColumn.php +++ b/src/OneDrive/Columns/NumberColumn.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:07:25+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Columns; use Office365\Runtime\ClientValue; class NumberColumn extends ClientValue diff --git a/src/OneDrive/PersonOrGroupColumn.php b/src/OneDrive/Columns/PersonOrGroupColumn.php similarity index 89% rename from src/OneDrive/PersonOrGroupColumn.php rename to src/OneDrive/Columns/PersonOrGroupColumn.php index 1d11e1ab..dcfba7bd 100644 --- a/src/OneDrive/PersonOrGroupColumn.php +++ b/src/OneDrive/Columns/PersonOrGroupColumn.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:07:25+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Columns; use Office365\Runtime\ClientValue; class PersonOrGroupColumn extends ClientValue diff --git a/src/OneDrive/Deleted.php b/src/OneDrive/DriveItems/Deleted.php similarity index 81% rename from src/OneDrive/Deleted.php rename to src/OneDrive/DriveItems/Deleted.php index cccc80f1..af9aa010 100644 --- a/src/OneDrive/Deleted.php +++ b/src/OneDrive/DriveItems/Deleted.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-24T22:10:26+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\DriveItems; use Office365\Runtime\ClientValue; class Deleted extends ClientValue diff --git a/src/OneDrive/Package.php b/src/OneDrive/DriveItems/Package.php similarity index 81% rename from src/OneDrive/Package.php rename to src/OneDrive/DriveItems/Package.php index 42cc5e18..8afcc2b5 100644 --- a/src/OneDrive/Package.php +++ b/src/OneDrive/DriveItems/Package.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-24T22:10:26+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\DriveItems; use Office365\Runtime\ClientValue; class Package extends ClientValue diff --git a/src/OneDrive/PublicationFacet.php b/src/OneDrive/DriveItems/PublicationFacet.php similarity index 85% rename from src/OneDrive/PublicationFacet.php rename to src/OneDrive/DriveItems/PublicationFacet.php index d8ee04c6..964eb3d1 100644 --- a/src/OneDrive/PublicationFacet.php +++ b/src/OneDrive/DriveItems/PublicationFacet.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-24T22:10:26+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\DriveItems; use Office365\Runtime\ClientValue; class PublicationFacet extends ClientValue diff --git a/src/OneDrive/RemoteItem.php b/src/OneDrive/DriveItems/RemoteItem.php similarity index 87% rename from src/OneDrive/RemoteItem.php rename to src/OneDrive/DriveItems/RemoteItem.php index 08eeb647..e4ed081c 100644 --- a/src/OneDrive/RemoteItem.php +++ b/src/OneDrive/DriveItems/RemoteItem.php @@ -3,9 +3,12 @@ /** * Modified: 2020-05-25T06:42:59+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\DriveItems; use Office365\Directory\Identities\IdentitySet; +use Office365\OneDrive\ItemReference; +use Office365\OneDrive\SharepointIds; +use Office365\OneDrive\Shares\Shared; use Office365\Runtime\ClientValue; class RemoteItem extends ClientValue { diff --git a/src/OneDrive/Drives/Drive.php b/src/OneDrive/Drives/Drive.php index a7556081..2c502f20 100644 --- a/src/OneDrive/Drives/Drive.php +++ b/src/OneDrive/Drives/Drive.php @@ -12,7 +12,6 @@ use Office365\OneDrive\DriveItems\DriveItemCollection; use Office365\OneDrive\DriveItems\SystemFacet; use Office365\OneDrive\Lists\SharePointList; -use Office365\OneDrive\Quota; use Office365\OneDrive\SharepointIds; use Office365\Runtime\ResourcePath; /** diff --git a/src/OneDrive/Quota.php b/src/OneDrive/Drives/Quota.php similarity index 91% rename from src/OneDrive/Quota.php rename to src/OneDrive/Drives/Quota.php index 84ba0557..406f1f29 100644 --- a/src/OneDrive/Quota.php +++ b/src/OneDrive/Drives/Quota.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-24T22:10:26+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Drives; use Office365\Runtime\ClientValue; class Quota extends ClientValue diff --git a/src/OneDrive/FieldValueSet.php b/src/OneDrive/ListItems/FieldValueSet.php similarity index 74% rename from src/OneDrive/FieldValueSet.php rename to src/OneDrive/ListItems/FieldValueSet.php index 725fc933..ca7d2ce2 100644 --- a/src/OneDrive/FieldValueSet.php +++ b/src/OneDrive/ListItems/FieldValueSet.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:07:25+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\ListItems; use Office365\Entity; diff --git a/src/OneDrive/Shared.php b/src/OneDrive/Shares/Shared.php similarity index 90% rename from src/OneDrive/Shared.php rename to src/OneDrive/Shares/Shared.php index 875e1d4c..4572c888 100644 --- a/src/OneDrive/Shared.php +++ b/src/OneDrive/Shares/Shared.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-25T06:42:59+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Shares; use Office365\Directory\Identities\IdentitySet; use Office365\Runtime\ClientValue; diff --git a/src/OneDrive/SharedDriveItem.php b/src/OneDrive/Shares/SharedDriveItem.php similarity index 88% rename from src/OneDrive/SharedDriveItem.php rename to src/OneDrive/Shares/SharedDriveItem.php index 1860f9ba..fc146f1d 100644 --- a/src/OneDrive/SharedDriveItem.php +++ b/src/OneDrive/Shares/SharedDriveItem.php @@ -3,10 +3,15 @@ /** * Modified: 2020-05-26T22:30:38+00:00 */ -namespace Office365\OneDrive; +namespace Office365\OneDrive\Shares; use Office365\Directory\Identities\IdentitySet; use Office365\Entity; +use Office365\OneDrive\DriveItems\DriveItem; +use Office365\OneDrive\DriveItems\DriveItemCollection; +use Office365\OneDrive\ListItems\ListItem; +use Office365\OneDrive\Lists\SharePointList; +use Office365\OneDrive\Sites\Site; use Office365\Runtime\ResourcePath; class SharedDriveItem extends Entity { diff --git a/src/Planner/PlannerCategoryDescriptions.php b/src/Planner/Plans/PlannerCategoryDescriptions.php similarity index 93% rename from src/Planner/PlannerCategoryDescriptions.php rename to src/Planner/Plans/PlannerCategoryDescriptions.php index 16c4d3c5..8765dead 100644 --- a/src/Planner/PlannerCategoryDescriptions.php +++ b/src/Planner/Plans/PlannerCategoryDescriptions.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:10:14+00:00 */ -namespace Office365\Planner; +namespace Office365\Planner\Plans; use Office365\Runtime\ClientValue; class PlannerCategoryDescriptions extends ClientValue diff --git a/src/Planner/PlannerAppliedCategories.php b/src/Planner/Tasks/PlannerAppliedCategories.php similarity index 80% rename from src/Planner/PlannerAppliedCategories.php rename to src/Planner/Tasks/PlannerAppliedCategories.php index 5033435c..462fdc5c 100644 --- a/src/Planner/PlannerAppliedCategories.php +++ b/src/Planner/Tasks/PlannerAppliedCategories.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:10:14+00:00 */ -namespace Office365\Planner; +namespace Office365\Planner\Tasks; use Office365\Runtime\ClientValue; class PlannerAppliedCategories extends ClientValue diff --git a/src/Planner/PlannerAssignedToTaskBoardTaskFormat.php b/src/Planner/Tasks/PlannerAssignedToTaskBoardTaskFormat.php similarity index 96% rename from src/Planner/PlannerAssignedToTaskBoardTaskFormat.php rename to src/Planner/Tasks/PlannerAssignedToTaskBoardTaskFormat.php index b1f6fb37..f9fa69b5 100644 --- a/src/Planner/PlannerAssignedToTaskBoardTaskFormat.php +++ b/src/Planner/Tasks/PlannerAssignedToTaskBoardTaskFormat.php @@ -3,9 +3,10 @@ /** * Modified: 2020-05-26T22:12:31+00:00 */ -namespace Office365\Planner; +namespace Office365\Planner\Tasks; use Office365\Entity; +use Office365\Planner\PlannerOrderHintsByAssignee; /** * The **plannerAssignedToTaskBoardTaskFormat** resource represents the information used to render a task correctly in the AssignedTo view of the Task Board (a view organized by users to whom tasks are assigned to). Each [task](plannertask.md) will have one **plannerAssignedToTaskBoardTaskFormat** object associated with it. diff --git a/src/Planner/PlannerExternalReference.php b/src/Planner/Tasks/PlannerExternalReference.php similarity index 92% rename from src/Planner/PlannerExternalReference.php rename to src/Planner/Tasks/PlannerExternalReference.php index caa905f8..9eb07577 100644 --- a/src/Planner/PlannerExternalReference.php +++ b/src/Planner/Tasks/PlannerExternalReference.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:10:14+00:00 */ -namespace Office365\Planner; +namespace Office365\Planner\Tasks; use Office365\Directory\Identities\IdentitySet; use Office365\Runtime\ClientValue; diff --git a/src/Planner/PlannerExternalReferences.php b/src/Planner/Tasks/PlannerExternalReferences.php similarity index 80% rename from src/Planner/PlannerExternalReferences.php rename to src/Planner/Tasks/PlannerExternalReferences.php index 3269bd1b..3017122b 100644 --- a/src/Planner/PlannerExternalReferences.php +++ b/src/Planner/Tasks/PlannerExternalReferences.php @@ -3,7 +3,7 @@ /** * Modified: 2020-05-26T22:10:14+00:00 */ -namespace Office365\Planner; +namespace Office365\Planner\Tasks; use Office365\Runtime\ClientValue; class PlannerExternalReferences extends ClientValue diff --git a/src/Planner/Tasks/PlannerTask.php b/src/Planner/Tasks/PlannerTask.php index 17616d1c..bd2158e8 100644 --- a/src/Planner/Tasks/PlannerTask.php +++ b/src/Planner/Tasks/PlannerTask.php @@ -8,8 +8,6 @@ use Office365\Directory\Identities\IdentitySet; use Office365\Entity; use Office365\Planner\Buckets\PlannerBucketTaskBoardTaskFormat; -use Office365\Planner\PlannerAppliedCategories; -use Office365\Planner\PlannerAssignedToTaskBoardTaskFormat; use Office365\Planner\PlannerAssignments; use Office365\Planner\PlannerProgressTaskBoardTaskFormat; use Office365\Runtime\ResourcePath;