Skip to content

Commit 6864373

Browse files
sanjaymandadisanjaymandadi
committed
Merge branch 'master' of https://github.com/sanjaymandadi/mozu-php-sdk into sanjaymandadi-master
Conflicts: composer.json src/ApiContext.php src/Clients/Commerce/Catalog/Admin/Attributedefinition/ProductTypeClient.php src/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraClient.php src/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionClient.php src/Clients/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyClient.php src/Clients/Commerce/Catalog/Admin/DiscountClient.php src/Clients/Commerce/Catalog/Admin/Discounts/DiscountTargetClient.php src/Clients/Commerce/Catalog/Admin/LocationInventoryClient.php src/Clients/Commerce/Catalog/Admin/ProductClient.php src/Clients/Commerce/Catalog/Admin/ProductReservationClient.php src/Clients/Commerce/Catalog/Admin/Products/LocationInventoryClient.php src/Clients/Commerce/Catalog/Admin/Products/ProductExtraClient.php src/Clients/Commerce/Catalog/Admin/Products/ProductOptionClient.php src/Clients/Commerce/Catalog/Admin/Products/ProductPropertyClient.php src/Clients/Commerce/Catalog/Admin/Products/ProductVariationClient.php src/Clients/Commerce/Catalog/Admin/PublishingScopeClient.php src/Clients/Commerce/Catalog/Storefront/ProductClient.php src/Clients/Content/DocumentListClient.php src/Clients/Content/DocumentListTypeClient.php src/Clients/Content/DocumentTypeClient.php src/Clients/Content/Documentlists/DocumentClient.php src/Clients/Content/Documentlists/DocumentTreeClient.php src/Clients/Content/PropertyTypeClient.php src/Contracts/CommerceRuntime/Discounts/AppliedDiscount.php src/Contracts/Customer/CustomerAccount.php src/Contracts/ProductAdmin/ProductCodeRename.php src/Contracts/ProductAdmin/SoftAllocationRenew.php src/Contracts/ProductRuntime/AppliedDiscount.php src/Mozu/Api/Clients/Commerce/Catalog/Admin/SearchClient.php src/Mozu/Api/Clients/Commerce/Orders/FulfillmentActionClient.php src/Mozu/Api/Clients/Content/Documentlists/ViewClient.php src/Mozu/Api/Clients/Platform/ApplicationClient.php src/Mozu/Api/Clients/Platform/EntityListClient.php src/Mozu/Api/Clients/Platform/Entitylists/EntityClient.php src/Mozu/Api/Clients/Platform/Entitylists/ListViewClient.php src/Mozu/Api/Contracts/AppDev/AuthTicket.php src/Mozu/Api/Contracts/CommerceRuntime/Carts/Cart.php src/Mozu/Api/Contracts/CommerceRuntime/Carts/CartChangeMessageCollection.php src/Mozu/Api/Contracts/CommerceRuntime/Carts/CartItem.php src/Mozu/Api/Contracts/CommerceRuntime/Discounts/Discount.php src/Mozu/Api/Contracts/CommerceRuntime/Fulfillment/DigitalPackage.php src/Mozu/Api/Contracts/CommerceRuntime/Fulfillment/Package.php src/Mozu/Api/Contracts/CommerceRuntime/Fulfillment/Pickup.php src/Mozu/Api/Contracts/CommerceRuntime/Orders/Order.php src/Mozu/Api/Contracts/CommerceRuntime/Orders/OrderItem.php src/Mozu/Api/Contracts/CommerceRuntime/Payments/Payment.php src/Mozu/Api/Contracts/CommerceRuntime/Products/BundledProduct.php src/Mozu/Api/Contracts/CommerceRuntime/Products/Category.php src/Mozu/Api/Contracts/CommerceRuntime/Products/Product.php src/Mozu/Api/Contracts/CommerceRuntime/Products/ProductOption.php src/Mozu/Api/Contracts/CommerceRuntime/Products/ProductPropertyValue.php src/Mozu/Api/Contracts/CommerceRuntime/Returns/ReturnItemCollection.php src/Mozu/Api/Contracts/CommerceRuntime/Wishlists/Wishlist.php src/Mozu/Api/Contracts/CommerceRuntime/Wishlists/WishlistItem.php src/Mozu/Api/Contracts/Content/Document.php src/Mozu/Api/Contracts/Content/DocumentDraftSummary.php src/Mozu/Api/Contracts/Content/DocumentInstallation.php src/Mozu/Api/Contracts/Content/DocumentList.php src/Mozu/Api/Contracts/Content/DocumentListType.php src/Mozu/Api/Contracts/Content/DocumentType.php src/Mozu/Api/Contracts/Content/Property.php src/Mozu/Api/Contracts/Content/PropertyType.php src/Mozu/Api/Contracts/Content/View.php src/Mozu/Api/Contracts/Content/ViewField.php src/Mozu/Api/Contracts/Core/Extensible/Attribute.php src/Mozu/Api/Contracts/Core/Extensible/AttributeMetadataItem.php src/Mozu/Api/Contracts/Core/Extensible/AttributeVocabularyValue.php src/Mozu/Api/Contracts/Core/ThirdParty/InitializablePropertyValue.php src/Mozu/Api/Contracts/Core/ThirdParty/InitializableShippingCountryPropertyValue.php src/Mozu/Api/Contracts/Core/UserSystemData.php src/Mozu/Api/Contracts/Customer/CustomerAccountAndAuthInfo.php src/Mozu/Api/Contracts/Customer/CustomerAuthTicket.php src/Mozu/Api/Contracts/Customer/CustomerLoginInfo.php src/Mozu/Api/Contracts/Customer/LoginState.php src/Mozu/Api/Contracts/Event/EventDeliveryAttempt.php src/Mozu/Api/Contracts/Event/EventDeliverySummary.php src/Mozu/Api/Contracts/Event/EventDeliverySummaryCollection.php src/Mozu/Api/Contracts/Event/EventSummary.php src/Mozu/Api/Contracts/Event/HttpStatus.php src/Mozu/Api/Contracts/Event/Subscription.php src/Mozu/Api/Contracts/Event/SubscriptionCollection.php src/Mozu/Api/Contracts/InstalledApplications/Application.php src/Mozu/Api/Contracts/InstalledApplications/Capability.php src/Mozu/Api/Contracts/MZDB/EntityCollection.php src/Mozu/Api/Contracts/MZDB/EntityContainer.php src/Mozu/Api/Contracts/MZDB/EntityContainerCollection.php src/Mozu/Api/Contracts/MZDB/EntityList.php src/Mozu/Api/Contracts/MZDB/EntityListCollection.php src/Mozu/Api/Contracts/MZDB/IndexedProperty.php src/Mozu/Api/Contracts/MZDB/ListView.php src/Mozu/Api/Contracts/MZDB/ListViewCollection.php src/Mozu/Api/Contracts/MZDB/ListViewField.php src/Mozu/Api/Contracts/PaymentService/GatewayCredentialFieldValue.php src/Mozu/Api/Contracts/PricingRuntime/ProductAttribute.php src/Mozu/Api/Contracts/PricingRuntime/ProductProperty.php src/Mozu/Api/Contracts/PricingRuntime/ProductPropertyValue.php src/Mozu/Api/Contracts/ProductAdmin/AttributeLocalizedContent.php src/Mozu/Api/Contracts/ProductAdmin/AttributeValidation.php src/Mozu/Api/Contracts/ProductAdmin/AttributeVocabularyValue.php src/Mozu/Api/Contracts/ProductAdmin/AttributeVocabularyValueDisplayInfo.php src/Mozu/Api/Contracts/ProductAdmin/Category.php src/Mozu/Api/Contracts/ProductAdmin/CategoryLocalizedContent.php src/Mozu/Api/Contracts/ProductAdmin/CategoryLocalizedImage.php src/Mozu/Api/Contracts/ProductAdmin/Discount.php src/Mozu/Api/Contracts/ProductAdmin/Facet.php src/Mozu/Api/Contracts/ProductAdmin/FacetSource.php src/Mozu/Api/Contracts/ProductAdmin/ProductExtraValue.php src/Mozu/Api/Contracts/ProductAdmin/ProductLocalizedImage.php src/Mozu/Api/Contracts/ProductAdmin/ProductPropertyValue.php src/Mozu/Api/Contracts/ProductAdmin/ProductVariation.php src/Mozu/Api/Contracts/ProductAdmin/Search/SearchSynonymSettings.php src/Mozu/Api/Contracts/ProductAdmin/SiteSearchKeywordRelevancySettings.php src/Mozu/Api/Contracts/ProductAdmin/SiteSearchPhraseRelevancySettings.php src/Mozu/Api/Contracts/ProductAdmin/SiteSearchRelevancyCustomField.php src/Mozu/Api/Contracts/ProductAdmin/SiteSearchSettings.php src/Mozu/Api/Contracts/ProductRuntime/AttributeDetail.php src/Mozu/Api/Contracts/ProductRuntime/AttributeValidation.php src/Mozu/Api/Contracts/ProductRuntime/AttributeVocabularyValueDisplayInfo.php src/Mozu/Api/Contracts/ProductRuntime/BundledProduct.php src/Mozu/Api/Contracts/ProductRuntime/BundledProductSummary.php src/Mozu/Api/Contracts/ProductRuntime/Category.php src/Mozu/Api/Contracts/ProductRuntime/CategoryContent.php src/Mozu/Api/Contracts/ProductRuntime/CategoryImage.php src/Mozu/Api/Contracts/ProductRuntime/Discount.php src/Mozu/Api/Contracts/ProductRuntime/LocationInventory.php src/Mozu/Api/Contracts/ProductRuntime/LocationInventoryQuery.php src/Mozu/Api/Contracts/ProductRuntime/Product.php src/Mozu/Api/Contracts/ProductRuntime/ProductContent.php src/Mozu/Api/Contracts/ProductRuntime/ProductImage.php src/Mozu/Api/Contracts/ProductRuntime/ProductOption.php src/Mozu/Api/Contracts/ProductRuntime/ProductOptionSelection.php src/Mozu/Api/Contracts/ProductRuntime/ProductOptionValue.php src/Mozu/Api/Contracts/ProductRuntime/ProductProperty.php src/Mozu/Api/Contracts/ProductRuntime/ProductPropertyValue.php src/Mozu/Api/Contracts/ProductRuntime/ProductValidationSummary.php src/Mozu/Api/Contracts/ProductRuntime/SearchSuggestionGroup.php src/Mozu/Api/Contracts/ProductRuntime/ValidationMessage.php src/Mozu/Api/Contracts/ShippingRuntime/Category.php src/Mozu/Api/Contracts/ShippingRuntime/ProductOption.php src/Mozu/Api/Contracts/ShippingRuntime/ProductProperty.php src/Mozu/Api/Contracts/ShippingRuntime/ProductSummary.php src/Mozu/Api/Contracts/ShippingRuntime/RateRequest.php src/Mozu/Api/Contracts/ShippingRuntime/RateRequestItem.php src/Mozu/Api/Contracts/ShippingRuntime/RatesResponse.php src/Mozu/Api/Contracts/SiteSettings/Application/Application.php src/Mozu/Api/Contracts/SiteSettings/Application/Capability.php src/Mozu/Api/Contracts/SiteSettings/Order/ExternalPaymentWorkflowDefinition.php src/Mozu/Api/Contracts/Tenant/Catalog.php src/Mozu/Api/Contracts/Tenant/MasterCatalog.php src/Mozu/Api/MozuClient.php src/Mozu/Api/MozuConfig.php src/Mozu/Api/Resources/Commerce/Admin/LocationResource.php src/Mozu/Api/Resources/Commerce/Admin/LocationTypeResource.php src/Mozu/Api/Resources/Commerce/CartResource.php src/Mozu/Api/Resources/Commerce/Carts/AppliedDiscountResource.php src/Mozu/Api/Resources/Commerce/Carts/CartItemResource.php src/Mozu/Api/Resources/Commerce/Carts/ChangeMessageResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/AttributeResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeLocalizedContentResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Attributes/AttributeVocabularyValueResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/ProductTypeResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeExtraResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeOptionResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypePropertyResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Attributedefinition/Producttypes/ProductTypeVariationResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/CategoryResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/DiscountResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Discounts/DiscountTargetResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/FacetResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/LocationInventoryResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/MasterCatalogResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/ProductReservationResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/ProductResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Products/ProductExtraResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Products/ProductOptionResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Products/ProductPropertyResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/Products/ProductVariationResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/PublishingScopeResource.php src/Mozu/Api/Resources/Commerce/Catalog/Admin/SearchResource.php src/Mozu/Api/Resources/Commerce/Catalog/Storefront/CategoryResource.php src/Mozu/Api/Resources/Commerce/Catalog/Storefront/ProductResource.php src/Mozu/Api/Resources/Commerce/Catalog/Storefront/ProductSearchResultResource.php src/Mozu/Api/Resources/Commerce/Catalog/Storefront/ShippingResource.php src/Mozu/Api/Resources/Commerce/ChannelGroupResource.php src/Mozu/Api/Resources/Commerce/ChannelResource.php src/Mozu/Api/Resources/Commerce/Customer/Accounts/CardResource.php src/Mozu/Api/Resources/Commerce/Customer/Accounts/CustomerAttributeResource.php src/Mozu/Api/Resources/Commerce/Customer/Accounts/CustomerContactResource.php src/Mozu/Api/Resources/Commerce/Customer/Accounts/CustomerNoteResource.php src/Mozu/Api/Resources/Commerce/Customer/Accounts/TransactionResource.php src/Mozu/Api/Resources/Commerce/Customer/Attributedefinition/AttributeResource.php src/Mozu/Api/Resources/Commerce/Customer/CreditResource.php src/Mozu/Api/Resources/Commerce/Customer/Credits/CreditTransactionResource.php src/Mozu/Api/Resources/Commerce/Customer/CustomerAccountResource.php src/Mozu/Api/Resources/Commerce/Customer/CustomerAuthTicketResource.php src/Mozu/Api/Resources/Commerce/Customer/CustomerSegmentResource.php src/Mozu/Api/Resources/Commerce/Customer/VisitResource.php src/Mozu/Api/Resources/Commerce/InStockNotificationSubscriptionResource.php src/Mozu/Api/Resources/Commerce/LocationResource.php src/Mozu/Api/Resources/Commerce/OrderResource.php src/Mozu/Api/Resources/Commerce/Orders/AdjustmentResource.php src/Mozu/Api/Resources/Commerce/Orders/AppliedDiscountResource.php src/Mozu/Api/Resources/Commerce/Orders/Attributedefinition/AttributeResource.php src/Mozu/Api/Resources/Commerce/Orders/BillingInfoResource.php src/Mozu/Api/Resources/Commerce/Orders/DigitalPackageResource.php src/Mozu/Api/Resources/Commerce/Orders/FulfillmentActionResource.php src/Mozu/Api/Resources/Commerce/Orders/FulfillmentInfoResource.php src/Mozu/Api/Resources/Commerce/Orders/OrderAttributeResource.php src/Mozu/Api/Resources/Commerce/Orders/OrderItemResource.php src/Mozu/Api/Resources/Commerce/Orders/OrderNoteResource.php src/Mozu/Api/Resources/Commerce/Orders/OrderValidationResultResource.php src/Mozu/Api/Resources/Commerce/Orders/PackageResource.php src/Mozu/Api/Resources/Commerce/Orders/PaymentResource.php src/Mozu/Api/Resources/Commerce/Orders/PickupResource.php src/Mozu/Api/Resources/Commerce/Orders/ShipmentResource.php src/Mozu/Api/Resources/Commerce/ReturnResource.php src/Mozu/Api/Resources/Commerce/Returns/PackageResource.php src/Mozu/Api/Resources/Commerce/Returns/ShipmentResource.php src/Mozu/Api/Resources/Commerce/Settings/ApplicationResource.php src/Mozu/Api/Resources/Commerce/Settings/Checkout/CustomerCheckoutSettingsResource.php src/Mozu/Api/Resources/Commerce/Settings/General/TaxableTerritoryResource.php src/Mozu/Api/Resources/Commerce/Settings/GeneralSettingsResource.php src/Mozu/Api/Resources/Commerce/Settings/LocationUsageResource.php src/Mozu/Api/Resources/Commerce/Settings/Shipping/SiteShippingHandlingFeeResource.php src/Mozu/Api/Resources/Commerce/WishlistResource.php src/Mozu/Api/Resources/Commerce/Wishlists/WishlistItemResource.php src/Mozu/Api/Resources/Content/DocumentDraftSummaryResource.php src/Mozu/Api/Resources/Content/DocumentListResource.php src/Mozu/Api/Resources/Content/DocumentListTypeResource.php src/Mozu/Api/Resources/Content/DocumentTypeResource.php src/Mozu/Api/Resources/Content/Documentlists/DocumentResource.php src/Mozu/Api/Resources/Content/Documentlists/DocumentTreeResource.php src/Mozu/Api/Resources/Content/Documentlists/FacetResource.php src/Mozu/Api/Resources/Content/Documentlists/ViewResource.php src/Mozu/Api/Resources/Content/PropertyTypeResource.php src/Mozu/Api/Resources/Event/Push/SubscriptionResource.php src/Mozu/Api/Resources/Event/Push/Subscriptions/EventDeliverySummaryResource.php src/Mozu/Api/Resources/Platform/Adminuser/AdminUserResource.php src/Mozu/Api/Resources/Platform/Adminuser/TenantAdminUserAuthTicketResource.php src/Mozu/Api/Resources/Platform/ApplicationResource.php src/Mozu/Api/Resources/Platform/Applications/AuthTicketResource.php src/Mozu/Api/Resources/Platform/Developer/DeveloperAdminUserAuthTicketResource.php src/Mozu/Api/Resources/Platform/EntityListResource.php src/Mozu/Api/Resources/Platform/Entitylists/EntityContainerResource.php src/Mozu/Api/Resources/Platform/Entitylists/EntityResource.php src/Mozu/Api/Resources/Platform/Entitylists/ListViewResource.php src/Mozu/Api/Resources/Platform/ReferenceDataResource.php src/Mozu/Api/Resources/Platform/SiteDataResource.php src/Mozu/Api/Resources/Platform/TenantDataResource.php src/Mozu/Api/Resources/Platform/UserDataResource.php src/Mozu/Api/Urls/Commerce/Orders/FulfillmentActionUrl.php src/Mozu/Api/Urls/Commerce/Orders/OrderItemUrl.php src/Mozu/Api/Urls/Content/Documentlists/ViewUrl.php src/Mozu/Api/Urls/Platform/ApplicationUrl.php src/Mozu/Api/Urls/Platform/Entitylists/ListViewUrl.php src/MozuUrl.php src/Security/AppAuthenticator.php src/Security/CustomerAuthenticator.php src/Security/UserAuthenticator.php tests/src/BaseTest.php tests/src/Clients/Platform/TenantClientTest.php tests/src/Mozu/Api/Resources/Commerce/Catalog/Admin/ProductResourceTest.php tests/src/Mozu/Api/Resources/Commerce/OrderResourceTest.php tests/src/Mozu/Api/Resources/Content/Documentlists/DocumentResourceTest.php tests/src/Mozu/Api/Security/UserAuthenticataorTest.php tests/src/Resources/Commerce/Catalog/Admin/Products/LocationInventoryResourceTest.php tests/src/Resources/Commerce/Catalog/Storefront/ProductResourceTest.php tests/src/Resources/Platform/TenantResourceTest.php tests/src/Security/AuthenticationTest.php tests/src/Security/CustomerAuthenticatorTest.php tests/src/php_unit.xml
2 parents 55624f1 + 41689bd commit 6864373

File tree

776 files changed

+215
-331
lines changed

Some content is hidden

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

776 files changed

+215
-331
lines changed

‎composer.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
},
1818
"autoload": {
1919
"psr-4": {
20-
"Mozu\\": "src/"
20+
"Mozu\\Api\\": "src/"
21+
}
22+
},
23+
"autoload-dev": {
24+
"psr-4": {
25+
"Mozu\\Tests\\": "tests/"
2126
}
2227
},
2328
"extra": {

‎src/Mozu/Api/ApiContext.php‎ renamed to ‎src/ApiContext.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
namespace Mozu\Api;
44

5-
use Mozu\Api\Contracts\Tenant\Tenant;
65
use Mozu\Api\Helpers\SignatureResolver;
7-
use Mozu\Api\Security\AppAuthenticator;
86

97
interface iApiContext
108
{

‎src/Mozu/Api/ApiException.php‎ renamed to ‎src/ApiException.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22
namespace Mozu\Api;
33

4-
use Mozu\Api\iApiContext;
54

65
class ApiException extends \RuntimeException {
76
private $correlationId;

‎src/Mozu/Api/ChangeLog.txt‎ renamed to ‎src/ChangeLog.txt‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/Admin/LocationClient.php‎ renamed to ‎src/Clients/Commerce/Admin/LocationClient.php‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/Admin/LocationTypeClient.php‎ renamed to ‎src/Clients/Commerce/Admin/LocationTypeClient.php‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/CartClient.php‎ renamed to ‎src/Clients/Commerce/CartClient.php‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/Carts/AppliedDiscountClient.php‎ renamed to ‎src/Clients/Commerce/Carts/AppliedDiscountClient.php‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/Carts/CartItemClient.php‎ renamed to ‎src/Clients/Commerce/Carts/CartItemClient.php‎

File renamed without changes.

‎src/Mozu/Api/Clients/Commerce/Carts/ChangeMessageClient.php‎ renamed to ‎src/Clients/Commerce/Carts/ChangeMessageClient.php‎

File renamed without changes.

0 commit comments

Comments
 (0)