Merge branch 'master' into em_prex-cmdlinetoug

Author: erikmarr

src/_data/toc/php-developer-guide.yml

@@ -265,6 +265,9 @@ pages:
         - label: Array Manager
           url: /extension-dev-guide/framework/array-manager.html
 
+        - label: URL Library
+          url: /extension-dev-guide/framework/url-library.html
+
     - label: Security
       children:
 

src/_includes/graphql/cart-object-24.md

@@ -5,13 +5,13 @@ Attribute |  Data Type | Description
 `applied_gift_cards` | [[`AppliedGiftCard`]][AppliedGiftCard] | An array of `AppliedGiftCard` objects. An `AppliedGiftCard` object contains the `code` text attribute, which specifies the gift card code. `applied_gift_cards` is a Commerce-only attribute, defined in the GiftCardAccountGraphQl module
 `applied_reward_points`| [`RewardPointsAmount`][RewardPointsAmount] | The amount of reward points applied to the cart
 `applied_store_credit` | [`AppliedStoreCredit`][AppliedStoreCredit] | Contains store credit information applied to the cart. `applied_store_credit` is a Commerce-only attribute, defined in the CustomerBalanceGraphQl module
-`available_gift_wrappings` | [GiftWrapping]! | The list of available gift wrapping options for the cart
+`available_gift_wrappings` | [[GiftWrapping]][GiftWrapping]! | The list of available gift wrapping options for the cart
 `available_payment_methods` | [[AvailablePaymentMethod]][AvailablePaymentMethod] | Available payment methods
 `billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
 `email` | String | The customer's email address
 `gift_message` | [GiftMessage][GiftMessage] | A gift message added to the cart
 `gift_receipt_included` | Boolean! | Indicates if the customer requested a gift receipt for the cart
-`gift_wrapping` | GiftWrapping | The selected gift wrapping for the cart
+`gift_wrapping` | [GiftWrapping][GiftWrapping] | The selected gift wrapping for the cart
 `id` | ID! | The ID of the cart
 `is_virtual` | Boolean! | Indicates whether the cart contains only virtual products
 `items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
@@ -29,6 +29,7 @@ Attribute |  Data Type | Description
 [CartItemInterface]: {{page.baseurl}}/graphql/queries/cart.html#CartItemInterface
 [CartPrices]: {{page.baseurl}}/graphql/queries/cart.html#CartPrices
 [GiftMessage]: {{page.baseurl}}/graphql/queries/cart.html#GiftMessage
+[GiftWrapping]: {{page.baseurl}}/graphql/queries/cart.html#GiftWrapping
 [RewardPointsAmount]: {{page.baseurl}}/graphql/queries/cart.html#RewardPointsAmount
 [SelectedPaymentMethod]: {{page.baseurl}}/graphql/queries/cart.html#SelectedPaymentMethod
 [ShippingCartAddress]: {{page.baseurl}}/graphql/queries/cart.html#ShippingCartAddress

src/_includes/graphql/customer-orders-output.md

@@ -43,23 +43,23 @@ Attribute | Data type | Description
 --- | --- | ---
 `billing_address` | [OrderAddress](#OrderAddress) | The billing address for the order
 `carrier` | String | The shipping carrier for the order delivery
-`comments` | [[SalesCommentItem](#SalesCommentItem)] | Comments on the order
+`comments` | [[SalesCommentItem]](#SalesCommentItem) | Comments on the order
 `created_at` | String | Deprecated. Use the `order_date` attribute instead
-`credit_memos` | [[CreditMemo](#CreditMemo)] | Contains a list of credit memos for the order
+`credit_memos` | [[CreditMemo]](#CreditMemo) | Contains a list of credit memos for the order
 `grand_total` | Float  | Deprecated. Use the `totals.grand_total` attribute instead
 `gift_message` | [GiftMessage](#GiftMessage) | The entered gift message for the order
 `gift_receipt_included` | Boolean! | Indicates if the customer requested a gift receipt for the order
 `gift_wrapping` | [GiftWrapping](#GiftWrapping) | The selected gift wrapping for the order
 `id` | ID! | Unique identifier for the order
 `increment_id` | String | Deprecated. Use the `id` attribute instead
-`invoices` | [[Invoice](#Invoice)]! | Contains a list of invoices for the order
-`items` | [[OrderItemInterface](#OrderItemInterface)] | An array containing the items purchased in this order
+`invoices` | [[Invoice]](#Invoice)! | Contains a list of invoices for the order
+`items` | [[OrderItemInterface]](#OrderItemInterface) | An array containing the items purchased in this order
 `number` | String! | The order number
 `order_date` | String! | The date the order was placed
 `order_number` | String! | Deprecated. Use the `number` attribute instead
-`payment_methods` | [[PaymentMethod](#PaymentMethod)] | Payment details for the order
+`payment_methods` | [[PaymentMethod]](#PaymentMethod) | Payment details for the order
 `printed_card_included` | Boolean! | Indicates if the customer requested a printed card for the order
-`shipments` | [[OrderShipment](#OrderShipment)] | Shipment list for the order
+`shipments` | [[OrderShipment]](#OrderShipment) | Shipment list for the order
 `shipping_address` | [OrderAddress](#OrderAddress) | Shipping address for the order
 `shipping_method` | String | Shipping method for the order
 `status` | String! | The current status of the order
@@ -73,9 +73,9 @@ The `CreditMemo` object contains details about credit memos applied to an order.
 
 Attribute | Data type | Description
 --- | --- | ---
-`comments` | [[SalesCommentItem](#SalesCommentItem)] | Comments on the credit memo
+`comments` | [[SalesCommentItem]](#SalesCommentItem) | Comments on the credit memo
 `id` | ID! | The unique ID of the credit memo
-`items` | [[CreditMemoItemInterface](#CreditMemoItemInterface)] | An array containing details about refunded items
+`items` | [[CreditMemoItemInterface]](#CreditMemoItemInterface) | An array containing details about refunded items
 `number` | String! | The sequential credit memo number
 `total` | [CreditMemoTotal](#CreditMemoTotal) | Contains details about the total refunded amount
 
@@ -95,11 +95,11 @@ Attribute | Data type | Description
 --- | --- | ---
 `adjustment` | Money! | An adjustment manually applied to the order
 `base_grand_total` | Money! | The final base grand total amount in the base currency
-`discounts` | [Discount] | The applied discounts to the order
+`discounts` | [[Discount]](#Discount) | The applied discounts to the order
 `grand_total` | Money! | The final total amount, including shipping, discounts, and taxes
 `shipping_handling` | [ShippingHandling](#ShippingHandling) | Contains details about the shipping and handling costs for the credit memo
 `subtotal` | Money! | The subtotal of the order, excluding shipping, discounts, and taxes
-`taxes` | [[TaxItem](#TaxItem)]! | An array containing information about taxes on individual orders
+`taxes` | [[TaxItem]](#TaxItem)! | An array containing information about taxes on individual orders
 `total_shipping` | Money! | The shipping amount for the credit memo
 `total_tax` | Money! | The amount of tax applied to all orders
 
@@ -126,9 +126,9 @@ The `Invoice` object provides details about a customer invoice.
 
 Attribute | Data type | Description
 --- | --- | ---
-`comments` | [[SalesCommentItem](#SalesCommentItem)] | Comments on the invoice
+`comments` | [[SalesCommentItem]](#SalesCommentItem) | Comments on the invoice
 `id` | ID! | The internal ID of the invoice
-`items` | [[InvoiceItemInterface](#InvoiceItemInterface)]! | Contains details about invoiced products
+`items` | [[InvoiceItemInterface]](#InvoiceItemInterface)! | Contains details about invoiced products
 `number` | String! | The sequential number of the invoice
 `total` | [InvoiceTotal](#InvoiceTotal)! | Invoice total amount details
 
@@ -149,11 +149,11 @@ The InvoiceTotal object contains details about the totals of an invoice.
 Attribute | Data type | Description
 --- | --- | ---
 `base_grand_total` | Money! | The final base grand total amount in the base currency
-`discounts` | [Discount] | The applied discounts to the invoice
+`discounts` | [[Discount]](#Discount) | The applied discounts to the invoice
 `grand_total` | Money! | The final total amount, including shipping, discounts, and taxes
 `shipping_handling` | [ShippingHandling](#ShippingHandling) | Contains details about the shipping and handling costs for the invoice
 `subtotal` | Money! | The subtotal of the invoice, excluding shipping, discounts, and taxes
-`taxes` | [[TaxItem](#TaxItem)] | An array containing information about taxes on individual invoices
+`taxes` | [[TaxItem]](#TaxItem) | An array containing information about taxes on individual invoices
 `total_shipping` | Money! | The shipping amount for the invoice
 `total_tax` | Money! | The amount of tax applied to all invoices
 
@@ -227,11 +227,11 @@ Attribute | Data type | Description
 
 Attribute | Data type | Description
 --- | --- | ---
-`comments` | [[SalesCommentItem](#SalesCommentItem)] | Comments added to the shipment
+`comments` | [[SalesCommentItem]](#SalesCommentItem) | Comments added to the shipment
 `id` | ID! | The unique ID of the shipment
-`items` | [[ShipmentItemInterface](#ShipmentItemInterface)] | Contains items included in the shipment
+`items` | [[ShipmentItemInterface]](#ShipmentItemInterface) | Contains items included in the shipment
 `number` | String! | The sequential credit shipment number
-`tracking` | [[ShipmentTracking](#ShipmentTracking)] | Contains shipment tracking detail
+`tracking` | [[ShipmentTracking]](#ShipmentTracking) | Contains shipment tracking detail
 
 #### OrderTotal attributes {#OrderTotal}
 
@@ -240,11 +240,11 @@ The `OrderTotal` object contains details about the sales total amounts used to c
 Attribute | Data type | Description
 --- | --- | ---
 `base_grand_total` | Money! | The final base grand total amount in the base currency
-`discounts` | [Discount] | The applied discounts to the order
+`discounts` | [[Discount]](#Discount) | The applied discounts to the order
 `grand_total` | Money! | The final total amount, including shipping, discounts, and taxes
 `shipping_handling` | [ShippingHandling](#ShippingHandling) | The shipping and handling costs for the order
 `subtotal` | Money! | The subtotal of the order, excluding shipping, discounts, and taxes
-`taxes` | [[TaxItem](#TaxItem)]! | An array containing information about taxes on individual orders
+`taxes` | [[TaxItem]](#TaxItem)! | An array containing information about taxes on individual orders
 `total_shipping` | Money! | The shipping costs for the order
 `total_tax` | Money! | The amount of tax applied to the order
 
@@ -254,7 +254,7 @@ The PaymentMethod data type contains details about the payment method used to pa
 
 Attribute | Data type | Description
 --- | --- | ---
-`additional_data` | [[KeyValue](#KeyValue)] | Additional data per payment method type
+`additional_data` | [[KeyValue]](#KeyValue) | Additional data per payment method type
 `name` | String! | The label that describes the payment method
 `type` | String! | The payment method code that indicates how the order was paid for
 
@@ -378,8 +378,8 @@ Attribute | Data type | Description
 --- | --- | ---
 `amount_excluding_tax` | Money | The shipping amount, excluding tax
 `amount_including_tax` | Money | The shipping amount, including tax
-`discounts` | [ShippingDiscount] | The applied discounts to the shipping
-`taxes` | [[TaxItem](#TaxItem)] | Contains details about taxes applied for shipping
+`discounts` | [[ShippingDiscount]](#ShippingDiscount) | The applied discounts to the shipping
+`taxes` | [[TaxItem]](#TaxItem) | Contains details about taxes applied for shipping
 `total_amount`| Money! | The total amount for shipping
 
 #### TaxItem attributes {#TaxItem}

src/_includes/graphql/customer-output-24.md

@@ -2,10 +2,16 @@
 {% assign customeraddress_text = '[CustomerAddress](#customerAddressOutput)' %}
 {% assign customeroutput_text = '[CustomerOrders](#customerOrders)' %}
 {% assign crossref_text = '. See [`orders` input attributes](#orders) for details' %}
+{% assign productreview_text = '[ProductReviews](#ProductReviews)!' %}
+{% assign rewardpoints_text = '[RewardPoints](#RewardPoints)' %}
+{% assign wishlist_text = '[Wishlist](#Wishlist)!' %}
 {% else %}
 {% assign customeraddress_text = 'CustomerAddress' %}
 {% assign customeroutput_text = '[CustomerOrders]' %}
 {% assign crossref_text = '' %}
+{% assign productreview_text = '[ProductReviews]!' %}
+{% assign rewardpoints_text = '[RewardPoints]' %}
+{% assign wishlist_text = '[Wishlist]!' %}
 {% endif %}
 
 Attribute |  Data Type | Description
@@ -26,8 +32,8 @@ Attribute |  Data Type | Description
 `middlename` |String | The customer's middle name
 `orders(<FilterCriteria>)` | {{ customeroutput_text }} | A list of the customer's placed orders{{ crossref_text }}
 `prefix` | String | An honorific, such as Dr., Mr., or Mrs.
-`reviews(pageSize: Int = 20 currentPage: Int = 1)` | ProductReviews! | The list of reviews of the product
-`reward_points` | RewardPoints | Details about the customer's reward points
+`reviews(pageSize: Int = 20 currentPage: Int = 1)` | {{ productreview_text }} | The list of reviews of the product
+`reward_points` | {{ rewardpoints_text }} | Details about the customer's reward points
 `suffix` | String | A value such as Sr., Jr., or III
 `taxvat` | String | The customer's Tax/VAT number (for corporate customers)
-`wishlist` | Wishlist! | Contains the contents of the customer's wish lists
+`wishlist` | {{ wishlist_text }} | Contains the contents of the customer's wish lists

src/_includes/graphql/invoice-item-interface.md

@@ -2,7 +2,7 @@ Attribute | Data type | Description
 --- | --- | ---
 `discounts` | [Discount] | Contains information about the final discount amount for the base product, including discounts on options
 `id` | ID! | The unique ID of the invoice item
-`order_item` | OrderItemInterface | Contains details about an individual order item
+`order_item` | [OrderItemInterface]({{page.baseurl}}/graphql/interfaces/order-item-interface.html) | Contains details about an individual order item
 `product_name` | String | The name of the base product
 `product_sale_price` | Money! | The sale price for the base product including selected options
 `product_sku` | String! | The SKU of the base product

src/_includes/graphql/order-item-interface.md

@@ -1,7 +1,7 @@
 Attribute |  Data Type | Description
 --- | --- | ---
 `discounts` | [Discount] | Final discount information for the product
-`entered_options` | [OrderItemOption] | The entered option for the base product, such as a logo or image
+`entered_options` | [`[OrderItemOption]`](#OrderItemOption) | The entered option for the base product, such as a logo or image
 `id` | ID! | The unique identifier for the order item
 `product_name` | String | The name of the base product
 `product_sale_price` | Money! | The sale price of the base product, including selected options
@@ -14,5 +14,12 @@ Attribute |  Data Type | Description
 `quantity_refunded` | Float | The number of refunded items
 `quantity_returned` | Float | The number of returned items
 `quantity_shipped` | Float | The number of shipped items
-`selected_options` | [OrderItemOption] | The selected options for the base product, such as color or size
-`status` | String | The status of the order item
+`selected_options` | [`[OrderItemOption]`](#OrderItemOption) | The selected options for the base product, such as color or size
+`status` | String | The status of the order item
+
+#### OrderItemOption attributes {#OrderItemOption}
+
+Attribute | Data type | Description
+--- | --- | ---
+`label` | String! | The name of the option
+`value` | String! | The value of the option

src/_includes/graphql/product-review.md

@@ -5,8 +5,8 @@ Attribute |  Data Type | Description
 `average_rating` | Float! | The average rating for product review
 `created_at` | String! | Date indicating when the review was created
 `nickname` | String! | The customer's nickname. Defaults to the customer name, if logged in
-`product` | ProductInterface! | Contains details about the reviewed product
-`ratings_breakdown` | [ProductReviewRating!]! | An array of ratings by rating category, such as quality, price, and value
+`product` | [ProductInterface!]({{ page.baseurl }}/graphql/interfaces/product-interface.html)| Contains details about the reviewed product
+`ratings_breakdown` | [[ProductReviewRating!]](#ProductReviewRating)! | An array of ratings by rating category, such as quality, price, and value
 `summary` | String! | The summary (title) of the review
 `text` | String! | The review text
 

src/guides/v2.3/extension-dev-guide/framework/serializer.md

@@ -26,12 +26,22 @@ For security reasons, `SerializerInterface` implementations, such as the Json an
 ### Json (default)
 
 The [`Magento\Framework\Serialize\Serializer\Json`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Serialize/Serializer/Json.php){:target="_blank"} class serializes and unserializes data using the [JSON](http://www.json.org/){:target="_blank"} format.
-This class does not unserialize objects.
+
+### JsonHexTag
+
+The [`Magento\Framework\Serialize\Serializer\JsonHexTag`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php){:target="_blank"} class serializes and unserializes data using the [JSON](http://www.json.org/){:target="_blank"} format using the `JSON_HEX_TAG` option enabled.
+
+### Base64Json
+
+The [`Magento\Framework\Serialize\Serializer\Base64Json`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Serialize/Serializer/Base64Json.php){:target="_blank"} class serializes and encodes in the base64 format, and decodes the base64 encoded string and unserializes data using the [JSON](http://www.json.org/){:target="_blank"} format.
 
 ### Serialize
 
 The [`Magento\Framework\Serialize\Serializer\Serialize`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Serialize/Serializer/Serialize.php){:target="_blank"} class is less secure than the Json implementation but provides better performance on large arrays.
-This class does not unserialize objects in [PHP](https://glossary.magento.com/php) 7.
+
+### FormData
+
+The [`Magento\Framework\Serialize\Serializer\FormData`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php){:target="_blank"} class unserializes the form data using the [JSON](http://www.json.org/){:target="_blank"} format. This class does not serialize objects to a form data format.
 
 {:.bs-callout-warning}
 Magento discourages using the Serialize implementation directly because it can lead to security vulnerabilities. Always use the `SerializerInterface` for serializing and unserializing.
@@ -129,4 +139,4 @@ Here is an example:
 }
 ...
 
-```
+```