diff --git a/app/code/Magento/Customer/Api/AccountManagementInterface.php b/app/code/Magento/Customer/Api/AccountManagementInterface.php index 389774fc144422a898e9f0050d4b3ebb79b05b65..3a686695721b836c470aa228b30f9c36f3f5ffc4 100644 --- a/app/code/Magento/Customer/Api/AccountManagementInterface.php +++ b/app/code/Magento/Customer/Api/AccountManagementInterface.php @@ -23,6 +23,7 @@ interface AccountManagementInterface /** * Create customer account. Perform necessary business operations like sending email. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface $customer * @param string $password * @param string $redirectUrl @@ -38,6 +39,7 @@ interface AccountManagementInterface /** * Create customer account using provided hashed password. Should not be exposed as a webapi. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface $customer * @param string $hash Password hash that we can save directly * @param string $redirectUrl URL fed to welcome email templates. Can be used by templates to, for example, direct @@ -56,6 +58,7 @@ interface AccountManagementInterface /** * Validate customer data. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface $customer * @return \Magento\Customer\Api\Data\ValidationResultsInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -65,6 +68,7 @@ interface AccountManagementInterface /** * Check if customer can be deleted. * + * @api * @param int $customerId * @return bool * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found @@ -75,6 +79,7 @@ interface AccountManagementInterface /** * Activate a customer account using a key that was sent in a confirmation e-mail. * + * @api * @param string $email * @param string $confirmationKey * @return \Magento\Customer\Api\Data\CustomerInterface @@ -85,6 +90,7 @@ interface AccountManagementInterface /** * Activate a customer account using a key that was sent in a confirmation e-mail. * + * @api * @param int $customerId * @param string $confirmationKey * @return \Magento\Customer\Api\Data\CustomerInterface @@ -95,6 +101,7 @@ interface AccountManagementInterface /** * Authenticate a customer by username and password * + * @api * @param string $email * @param string $password * @return \Magento\Customer\Api\Data\CustomerInterface @@ -105,6 +112,7 @@ interface AccountManagementInterface /** * Change customer password. * + * @api * @param string $email * @param string $currentPassword * @param string $newPassword @@ -116,6 +124,7 @@ interface AccountManagementInterface /** * Change customer password. * + * @api * @param int $customerId * @param string $currentPassword * @param string $newPassword @@ -127,6 +136,7 @@ interface AccountManagementInterface /** * Send an email to the customer with a password reset link. * + * @api * @param string $email * @param string $template * @param int $websiteId @@ -138,6 +148,7 @@ interface AccountManagementInterface /** * Reset customer password. * + * @api * @param string $email * @param string $resetToken * @param string $newPassword @@ -149,6 +160,7 @@ interface AccountManagementInterface /** * Check if password reset token is valid. * + * @api * @param int $customerId * @param string $resetPasswordLinkToken * @return bool True if the token is valid @@ -163,6 +175,7 @@ interface AccountManagementInterface /** * Gets the account confirmation status. * + * @api * @param int $customerId * @return string * @throws \Magento\Framework\Exception\LocalizedException @@ -172,6 +185,7 @@ interface AccountManagementInterface /** * Resend confirmation email. * + * @api * @param string $email * @param int $websiteId * @param string $redirectUrl @@ -183,6 +197,7 @@ interface AccountManagementInterface /** * Check if given email is associated with a customer account in given website. * + * @api * @param string $customerEmail * @param int $websiteId If not set, will use the current websiteId * @return bool @@ -193,6 +208,7 @@ interface AccountManagementInterface /** * Check store availability for customer given the customerId. * + * @api * @param int $customerWebsiteId * @param int $storeId * @return bool @@ -203,6 +219,7 @@ interface AccountManagementInterface /** * Retrieve default billing address for the given customerId. * + * @api * @param int $customerId * @return \Magento\Customer\Api\Data\AddressInterface * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid @@ -213,6 +230,7 @@ interface AccountManagementInterface /** * Retrieve default shipping address for the given customerId. * + * @api * @param int $customerId * @return \Magento\Customer\Api\Data\AddressInterface * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid @@ -223,6 +241,7 @@ interface AccountManagementInterface /** * Return hashed password, which can be directly saved to database. * + * @api * @param string $password * @return string */ diff --git a/app/code/Magento/Customer/Api/AddressRepositoryInterface.php b/app/code/Magento/Customer/Api/AddressRepositoryInterface.php index 7102d16bbacdb19aea2fa1756a2dbbbb8b4a0ec7..384ce945fb12159175b89c7164e661158851ed5e 100644 --- a/app/code/Magento/Customer/Api/AddressRepositoryInterface.php +++ b/app/code/Magento/Customer/Api/AddressRepositoryInterface.php @@ -14,6 +14,7 @@ interface AddressRepositoryInterface /** * Save customer address. * + * @api * @param \Magento\Customer\Api\Data\AddressInterface $address * @return \Magento\Customer\Api\Data\AddressInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -23,6 +24,7 @@ interface AddressRepositoryInterface /** * Retrieve customer address. * + * @api * @param int $addressId * @return \Magento\Customer\Api\Data\AddressInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -32,6 +34,7 @@ interface AddressRepositoryInterface /** * Retrieve customers addresses matching the specified criteria. * + * @api * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria * @return \Magento\Customer\Api\Data\AddressSearchResultsInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -41,6 +44,7 @@ interface AddressRepositoryInterface /** * Delete customer address. * + * @api * @param \Magento\Customer\Api\Data\AddressInterface $address * @return bool true on success * @throws \Magento\Framework\Exception\LocalizedException @@ -50,6 +54,7 @@ interface AddressRepositoryInterface /** * Delete customer address by ID. * + * @api * @param int $addressId * @return bool true on success * @throws \Magento\Framework\Exception\NoSuchEntityException diff --git a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php index a550b9d94692c2ea9a43ef04f007c8a583873bbe..72dc3cd2ef4e2c95a2e3f96ded8dde8856a57f12 100644 --- a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php +++ b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php @@ -15,6 +15,7 @@ interface CustomerRepositoryInterface /** * Create customer. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface $customer * @param string $passwordHash * @return \Magento\Customer\Api\Data\CustomerInterface @@ -27,6 +28,7 @@ interface CustomerRepositoryInterface /** * Retrieve customer. * + * @api * @param string $email * @param int|null $websiteId * @return \Magento\Customer\Api\Data\CustomerInterface @@ -38,6 +40,7 @@ interface CustomerRepositoryInterface /** * Retrieve customer. * + * @api * @param int $customerId * @return \Magento\Customer\Api\Data\CustomerInterface * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist. @@ -48,6 +51,7 @@ interface CustomerRepositoryInterface /** * Retrieve customers which match a specified criteria. * + * @api * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -57,6 +61,7 @@ interface CustomerRepositoryInterface /** * Delete customer. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface $customer * @return bool true on success * @throws \Magento\Framework\Exception\LocalizedException @@ -66,6 +71,7 @@ interface CustomerRepositoryInterface /** * Delete customer by ID. * + * @api * @param int $customerId * @return bool true on success * @throws \Magento\Framework\Exception\NoSuchEntityException diff --git a/app/code/Magento/Customer/Api/Data/AddressInterface.php b/app/code/Magento/Customer/Api/Data/AddressInterface.php index d4828f5abc8e67580ca9abcfb338bffb8b172cdf..3b2b7d4ff0f065f4fcd5a18c5c687dd17aa4a17b 100644 --- a/app/code/Magento/Customer/Api/Data/AddressInterface.php +++ b/app/code/Magento/Customer/Api/Data/AddressInterface.php @@ -38,6 +38,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get ID * + * @api * @return int|null */ public function getId(); @@ -45,6 +46,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set ID * + * @api * @param int $id * @return $this */ @@ -53,6 +55,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get customer ID * + * @api * @return int|null */ public function getCustomerId(); @@ -60,6 +63,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set customer ID * + * @api * @param int $customerId * @return $this */ @@ -68,6 +72,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get region * + * @api * @return \Magento\Customer\Api\Data\RegionInterface|null */ public function getRegion(); @@ -75,6 +80,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set region * + * @api * @param \Magento\Customer\Api\Data\RegionInterface $region * @return $this */ @@ -83,6 +89,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Two-letter country code in ISO_3166-2 format * + * @api * @return string|null */ public function getCountryId(); @@ -90,6 +97,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set country id * + * @api * @param string $countryId * @return $this */ @@ -98,6 +106,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get street * + * @api * @return string[]|null */ public function getStreet(); @@ -105,6 +114,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set street * + * @api * @param string[] $street * @return $this */ @@ -113,6 +123,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get company * + * @api * @return string|null */ public function getCompany(); @@ -120,6 +131,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set company * + * @api * @param string $company * @return $this */ @@ -128,6 +140,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get telephone number * + * @api * @return string|null */ public function getTelephone(); @@ -135,6 +148,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set telephone number * + * @api * @param string $telephone * @return $this */ @@ -143,6 +157,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get fax number * + * @api * @return string|null */ public function getFax(); @@ -150,6 +165,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set fax number * + * @api * @param string $fax * @return $this */ @@ -158,6 +174,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get postcode * + * @api * @return string|null */ public function getPostcode(); @@ -165,6 +182,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set postcode * + * @api * @param string $postcode * @return $this */ @@ -173,6 +191,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get city name * + * @api * @return string|null */ public function getCity(); @@ -180,6 +199,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set city name * + * @api * @param string $city * @return $this */ @@ -188,6 +208,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get first name * + * @api * @return string|null */ public function getFirstname(); @@ -195,6 +216,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set first name * + * @api * @param string $firstName * @return $this */ @@ -203,6 +225,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get last name * + * @api * @return string|null */ public function getLastname(); @@ -210,6 +233,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set last name * + * @api * @param string $lastName * @return $this */ @@ -218,6 +242,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get middle name * + * @api * @return string|null */ public function getMiddlename(); @@ -225,6 +250,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set middle name * + * @api * @param string $middleName * @return $this */ @@ -233,6 +259,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get prefix * + * @api * @return string|null */ public function getPrefix(); @@ -240,6 +267,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set prefix * + * @api * @param string $prefix * @return $this */ @@ -248,6 +276,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get suffix * + * @api * @return string|null */ public function getSuffix(); @@ -255,6 +284,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set suffix * + * @api * @param string $suffix * @return $this */ @@ -263,6 +293,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get Vat id * + * @api * @return string|null */ public function getVatId(); @@ -270,6 +301,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set Vat id * + * @api * @param string $vatId * @return $this */ @@ -278,6 +310,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get if this address is default shipping address. * + * @api * @return bool|null */ public function isDefaultShipping(); @@ -285,6 +318,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set if this address is default shipping address. * + * @api * @param bool $isDefaultShipping * @return $this */ @@ -293,6 +327,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Get if this address is default billing address * + * @api * @return bool|null */ public function isDefaultBilling(); @@ -300,6 +335,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set if this address is default billing address * + * @api * @param bool $isDefaultBilling * @return $this */ @@ -308,6 +344,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Retrieve existing extension attributes object or create a new one. * + * @api * @return \Magento\Customer\Api\Data\AddressExtensionInterface|null */ public function getExtensionAttributes(); @@ -315,6 +352,7 @@ interface AddressInterface extends \Magento\Framework\Api\CustomAttributesDataIn /** * Set an extension attributes object. * + * @api * @param \Magento\Customer\Api\Data\AddressExtensionInterface $extensionAttributes * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php index ab08ea9e87b298b8641bd714742834da1976efe0..f74c607091c2c3254c4f07461cc66afaa55837d3 100644 --- a/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php +++ b/app/code/Magento/Customer/Api/Data/AddressSearchResultsInterface.php @@ -14,6 +14,7 @@ interface AddressSearchResultsInterface extends \Magento\Framework\Api\SearchRes /** * Get customer addresses list. * + * @api * @return \Magento\Customer\Api\Data\AddressInterface[] */ public function getItems(); @@ -21,6 +22,7 @@ interface AddressSearchResultsInterface extends \Magento\Framework\Api\SearchRes /** * Set customer addresses list. * + * @api * @param \Magento\Customer\Api\Data\AddressInterface[] $items * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php b/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php index d5af12db20d6176e3621b0b155eb083f704b0bba..988aea370ef94d5a181d734fb72783055fe52ae9 100644 --- a/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php +++ b/app/code/Magento/Customer/Api/Data/AttributeMetadataInterface.php @@ -36,6 +36,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Frontend HTML for input element. * + * @api * @return string */ public function getFrontendInput(); @@ -43,6 +44,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set frontend HTML for input element. * + * @api * @param string $frontendInput * @return $this */ @@ -51,6 +53,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get template used for input (e.g. "date") * + * @api * @return string */ public function getInputFilter(); @@ -58,6 +61,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set template used for input (e.g. "date") * + * @api * @param string $inputFilter * @return $this */ @@ -66,6 +70,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get label of the store. * + * @api * @return string */ public function getStoreLabel(); @@ -73,6 +78,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set label of the store. * + * @api * @param string $storeLabel * @return $this */ @@ -81,6 +87,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Retrieve validation rules. * + * @api * @return \Magento\Customer\Api\Data\ValidationRuleInterface[] */ public function getValidationRules(); @@ -88,6 +95,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set validation rules. * + * @api * @param \Magento\Customer\Api\Data\ValidationRuleInterface[] $validationRules * @return $this */ @@ -96,6 +104,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Number of lines of the attribute value. * + * @api * @return int */ public function getMultilineCount(); @@ -103,6 +112,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set number of lines of the attribute value. * + * @api * @param int $multilineCount * @return $this */ @@ -111,6 +121,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Whether attribute is visible on frontend. * + * @api * @return bool */ public function isVisible(); @@ -118,6 +129,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set whether attribute is visible on frontend. * + * @api * @param bool $isVisible * @return $this */ @@ -126,6 +138,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Whether attribute is required. * + * @api * @return bool */ public function isRequired(); @@ -133,6 +146,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set whether attribute is required. * + * @api * @param bool $isRequired * @return $this */ @@ -141,6 +155,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get data model for attribute. * + * @api * @return string */ public function getDataModel(); @@ -148,6 +163,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get data model for attribute. * + * @api * @param string $dataModel * @return $this */ @@ -156,6 +172,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Return options of the attribute (key => value pairs for select) * + * @api * @return \Magento\Customer\Api\Data\OptionInterface[] */ public function getOptions(); @@ -163,6 +180,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set options of the attribute (key => value pairs for select) * + * @api * @param \Magento\Customer\Api\Data\OptionInterface[] $options * @return $this */ @@ -171,6 +189,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get class which is used to display the attribute on frontend. * + * @api * @return string */ public function getFrontendClass(); @@ -178,6 +197,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set class which is used to display the attribute on frontend. * + * @api * @param string $frontendClass * @return $this */ @@ -186,6 +206,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Whether current attribute has been defined by a user. * + * @api * @return bool */ public function isUserDefined(); @@ -193,6 +214,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set whether current attribute has been defined by a user. * + * @api * @param bool $isUserDefined * @return $this */ @@ -201,6 +223,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get attributes sort order. * + * @api * @return int */ public function getSortOrder(); @@ -208,6 +231,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get attributes sort order. * + * @api * @param int $sortOrder * @return $this */ @@ -216,6 +240,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get label which supposed to be displayed on frontend. * + * @api * @return string */ public function getFrontendLabel(); @@ -223,6 +248,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set label which supposed to be displayed on frontend. * + * @api * @param string $frontendLabel * @return $this */ @@ -231,6 +257,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get the note attribute for the element. * + * @api * @return string */ public function getNote(); @@ -238,6 +265,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set the note attribute for the element. * + * @api * @param string $note * @return $this */ @@ -246,6 +274,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Whether this is a system attribute. * + * @api * @return bool */ public function isSystem(); @@ -253,6 +282,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set whether this is a system attribute. * + * @api * @param bool $isSystem * @return $this */ @@ -261,6 +291,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Get backend type. * + * @api * @return string */ public function getBackendType(); @@ -268,6 +299,7 @@ interface AttributeMetadataInterface extends \Magento\Framework\Api\MetadataObje /** * Set backend type. * + * @api * @param string $backendType * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/CustomerInterface.php b/app/code/Magento/Customer/Api/Data/CustomerInterface.php index 78be9d556014ac871eff29a9053153033690a736..681d29c2b9d52f8ec1c4fb18d1fecbf68b3bb178 100644 --- a/app/code/Magento/Customer/Api/Data/CustomerInterface.php +++ b/app/code/Magento/Customer/Api/Data/CustomerInterface.php @@ -37,6 +37,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get customer id * + * @api * @return int|null */ public function getId(); @@ -44,6 +45,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set customer id * + * @api * @param int $id * @return $this */ @@ -52,6 +54,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get group id * + * @api * @return int|null */ public function getGroupId(); @@ -59,6 +62,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set group id * + * @api * @param int $groupId * @return $this */ @@ -67,6 +71,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get default billing address id * + * @api * @return string|null */ public function getDefaultBilling(); @@ -74,6 +79,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set default billing address id * + * @api * @param string $defaultBilling * @return $this */ @@ -82,6 +88,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get default shipping address id * + * @api * @return string|null */ public function getDefaultShipping(); @@ -89,6 +96,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set default shipping address id * + * @api * @param string $defaultShipping * @return $this */ @@ -97,6 +105,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get confirmation * + * @api * @return string|null */ public function getConfirmation(); @@ -104,6 +113,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set confirmation * + * @api * @param string $confirmation * @return $this */ @@ -112,6 +122,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get created at time * + * @api * @return string|null */ public function getCreatedAt(); @@ -119,6 +130,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set created at time * + * @api * @param string $createdAt * @return $this */ @@ -127,6 +139,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get created in area * + * @api * @return string|null */ public function getCreatedIn(); @@ -134,6 +147,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set created in area * + * @api * @param string $createdIn * @return $this */ @@ -142,6 +156,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get date of birth * + * @api * @return string|null */ public function getDob(); @@ -149,6 +164,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set date of birth * + * @api * @param string $dob * @return $this */ @@ -157,6 +173,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get email address * + * @api * @return string */ public function getEmail(); @@ -164,6 +181,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set email address * + * @api * @param string $email * @return $this */ @@ -172,6 +190,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get first name * + * @api * @return string */ public function getFirstname(); @@ -179,6 +198,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set first name * + * @api * @param string $firstname * @return $this */ @@ -187,6 +207,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get last name * + * @api * @return string */ public function getLastname(); @@ -194,6 +215,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set last name * + * @api * @param string $lastname * @return string */ @@ -202,6 +224,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get middle name * + * @api * @return string|null */ public function getMiddlename(); @@ -209,6 +232,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set middle name * + * @api * @param string $middlename * @return $this */ @@ -217,6 +241,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get prefix * + * @api * @return string|null */ public function getPrefix(); @@ -224,6 +249,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set prefix * + * @api * @param string $prefix * @return $this */ @@ -232,6 +258,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get suffix * + * @api * @return string|null */ public function getSuffix(); @@ -239,6 +266,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set suffix * + * @api * @param string $suffix * @return $this */ @@ -247,6 +275,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get gender * + * @api * @return string|null */ public function getGender(); @@ -254,6 +283,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set gender * + * @api * @param string $gender * @return $this */ @@ -262,6 +292,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get store id * + * @api * @return int|null */ public function getStoreId(); @@ -269,6 +300,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set store id * + * @api * @param int $storeId * @return $this */ @@ -277,6 +309,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get tax Vat * + * @api * @return string|null */ public function getTaxvat(); @@ -284,6 +317,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set tax Vat * + * @api * @param string $taxvat * @return $this */ @@ -292,6 +326,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get website id * + * @api * @return int|null */ public function getWebsiteId(); @@ -299,6 +334,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set website id * + * @api * @param int $websiteId * @return $this */ @@ -307,6 +343,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Get customer addresses. * + * @api * @return \Magento\Customer\Api\Data\AddressInterface[]|null */ public function getAddresses(); @@ -314,6 +351,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set customer addresses. * + * @api * @param \Magento\Customer\Api\Data\AddressInterface[] $addresses * @return $this */ @@ -322,6 +360,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Retrieve existing extension attributes object or create a new one. * + * @api * @return \Magento\Customer\Api\Data\CustomerExtensionInterface|null */ public function getExtensionAttributes(); @@ -329,6 +368,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI /** * Set an extension attributes object. * + * @api * @param \Magento\Customer\Api\Data\CustomerExtensionInterface $extensionAttributes * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php index 2a020f9deeb09503817655494eaa0d2a57208dee..9cf801526d30894b06a58120ef4f262f91009b64 100644 --- a/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php +++ b/app/code/Magento/Customer/Api/Data/CustomerSearchResultsInterface.php @@ -14,6 +14,7 @@ interface CustomerSearchResultsInterface extends \Magento\Framework\Api\SearchRe /** * Get customers list. * + * @api * @return \Magento\Customer\Api\Data\CustomerInterface[] */ public function getItems(); @@ -21,6 +22,7 @@ interface CustomerSearchResultsInterface extends \Magento\Framework\Api\SearchRe /** * Set customers list. * + * @api * @param \Magento\Customer\Api\Data\CustomerInterface[] $items * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/GroupInterface.php b/app/code/Magento/Customer/Api/Data/GroupInterface.php index 7bb583d433a33e3ad16129038c9c03d7abf95cb9..1ba779941a653fc01ab6f063e754782f331756eb 100644 --- a/app/code/Magento/Customer/Api/Data/GroupInterface.php +++ b/app/code/Magento/Customer/Api/Data/GroupInterface.php @@ -29,6 +29,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Get id * + * @api * @return int|null */ public function getId(); @@ -36,6 +37,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Set id * + * @api * @param int $id * @return $this */ @@ -44,6 +46,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Get code * + * @api * @return string */ public function getCode(); @@ -51,6 +54,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Set code * + * @api * @param string $code * @return $this */ @@ -59,6 +63,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Get tax class id * + * @api * @return int */ public function getTaxClassId(); @@ -66,6 +71,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Set tax class id * + * @api * @param int $taxClassId * @return $this */ @@ -74,6 +80,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Get tax class name * + * @api * @return string|null */ public function getTaxClassName(); @@ -81,6 +88,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Set tax class name * + * @api * @param string $taxClassName * @return string|null */ @@ -89,6 +97,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Retrieve existing extension attributes object or create a new one. * + * @api * @return \Magento\Customer\Api\Data\GroupExtensionInterface|null */ public function getExtensionAttributes(); @@ -96,6 +105,7 @@ interface GroupInterface extends ExtensibleDataInterface /** * Set an extension attributes object. * + * @api * @param \Magento\Customer\Api\Data\GroupExtensionInterface $extensionAttributes * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php b/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php index 953c2f2381498b6534652defd89065e69c71cdf0..f8effeeb8fc5a3783e2d2c41a4d6b3f8eddac3b2 100644 --- a/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php +++ b/app/code/Magento/Customer/Api/Data/GroupSearchResultsInterface.php @@ -14,6 +14,7 @@ interface GroupSearchResultsInterface extends \Magento\Framework\Api\SearchResul /** * Get customer groups list. * + * @api * @return \Magento\Customer\Api\Data\GroupInterface[] */ public function getItems(); @@ -21,6 +22,7 @@ interface GroupSearchResultsInterface extends \Magento\Framework\Api\SearchResul /** * Set customer groups list. * + * @api * @param \Magento\Customer\Api\Data\GroupInterface[] $items * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/OptionInterface.php b/app/code/Magento/Customer/Api/Data/OptionInterface.php index 16ad22278e2a6221525b0ada114c907f2c7f328b..a0fe1cf3c0f085fd1c124c2f450bba2eb84e5dc4 100644 --- a/app/code/Magento/Customer/Api/Data/OptionInterface.php +++ b/app/code/Magento/Customer/Api/Data/OptionInterface.php @@ -23,6 +23,7 @@ interface OptionInterface /** * Get option label * + * @api * @return string */ public function getLabel(); @@ -30,6 +31,7 @@ interface OptionInterface /** * Set option label * + * @api * @param string $label * @return $this */ @@ -38,6 +40,7 @@ interface OptionInterface /** * Get option value * + * @api * @return string|null */ public function getValue(); @@ -45,6 +48,7 @@ interface OptionInterface /** * Set option value * + * @api * @param string $value * @return $this */ @@ -53,6 +57,7 @@ interface OptionInterface /** * Get nested options * + * @api * @return \Magento\Customer\Api\Data\OptionInterface[]|null */ public function getOptions(); @@ -60,6 +65,7 @@ interface OptionInterface /** * Set nested options * + * @api * @param \Magento\Customer\Api\Data\OptionInterface[] $options * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/RegionInterface.php b/app/code/Magento/Customer/Api/Data/RegionInterface.php index 808274c02f051b2decca7e39a2f7d0b614ca22a6..8e497834668abb1dd1f4b077b2a588fbdff1a28a 100644 --- a/app/code/Magento/Customer/Api/Data/RegionInterface.php +++ b/app/code/Magento/Customer/Api/Data/RegionInterface.php @@ -24,6 +24,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Get region code * + * @api * @return string */ public function getRegionCode(); @@ -31,6 +32,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Set region code * + * @api * @param string $regionCode * @return $this */ @@ -39,6 +41,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Get region * + * @api * @return string */ public function getRegion(); @@ -46,6 +49,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Set region * + * @api * @param string $region * @return $this */ @@ -54,6 +58,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Get region id * + * @api * @return int */ public function getRegionId(); @@ -61,6 +66,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Set region id * + * @api * @param int $regionId * @return $this */ @@ -69,6 +75,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Retrieve existing extension attributes object or create a new one. * + * @api * @return \Magento\Customer\Api\Data\RegionExtensionInterface|null */ public function getExtensionAttributes(); @@ -76,6 +83,7 @@ interface RegionInterface extends ExtensibleDataInterface /** * Set an extension attributes object. * + * @api * @param \Magento\Customer\Api\Data\RegionExtensionInterface $extensionAttributes * @return $this */ diff --git a/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php b/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php index 7e9d830f0e9892e8e6da28e51f9fd2deae680fdb..7688f522b9bdc71200d3ec91f36a82a00c058a4a 100644 --- a/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php +++ b/app/code/Magento/Customer/Api/Data/ValidationResultsInterface.php @@ -22,6 +22,7 @@ interface ValidationResultsInterface /** * Check if the provided data is valid. * + * @api * @return bool */ public function isValid(); @@ -29,6 +30,7 @@ interface ValidationResultsInterface /** * Set if the provided data is valid. * + * @api * @param bool $isValid * @return $this */ @@ -37,6 +39,7 @@ interface ValidationResultsInterface /** * Get error messages as array in case of validation failure, else return empty array. * + * @api * @return string[] */ public function getMessages(); @@ -44,6 +47,7 @@ interface ValidationResultsInterface /** * Set error messages as array in case of validation failure. * + * @api * @param string[] $messages * @return string[] */ diff --git a/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php b/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php index 78e3bf4af1984a332985359a3a80f7ff34545b8e..589f73d5ffbc05231ba24b8c3343ffe4ccb641be 100644 --- a/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php +++ b/app/code/Magento/Customer/Api/Data/ValidationRuleInterface.php @@ -22,6 +22,7 @@ interface ValidationRuleInterface /** * Get validation rule name * + * @api * @return string */ public function getName(); @@ -29,6 +30,7 @@ interface ValidationRuleInterface /** * Set validation rule name * + * @api * @param string $name * @return $this */ @@ -37,6 +39,7 @@ interface ValidationRuleInterface /** * Get validation rule value * + * @api * @return string */ public function getValue(); @@ -44,6 +47,7 @@ interface ValidationRuleInterface /** * Set validation rule value * + * @api * @param string $value * @return $this */ diff --git a/app/code/Magento/Customer/Api/GroupManagementInterface.php b/app/code/Magento/Customer/Api/GroupManagementInterface.php index b5bc26b9b70545fb0c5da804ac312fa418829a2d..3b051eb041a3708ec86d1d78142279d0e2faf3fe 100644 --- a/app/code/Magento/Customer/Api/GroupManagementInterface.php +++ b/app/code/Magento/Customer/Api/GroupManagementInterface.php @@ -24,6 +24,7 @@ interface GroupManagementInterface /** * Get default customer group. * + * @api * @param int $storeId * @return \Magento\Customer\Api\Data\GroupInterface * @throws \Magento\Framework\Exception\NoSuchEntityException @@ -34,6 +35,7 @@ interface GroupManagementInterface /** * Get customer group representing customers not logged in. * + * @api * @return \Magento\Customer\Api\Data\GroupInterface * @throws \Magento\Framework\Exception\NoSuchEntityException * @throws \Magento\Framework\Exception\LocalizedException @@ -43,6 +45,7 @@ interface GroupManagementInterface /** * Get all customer groups except group representing customers not logged in. * + * @api * @return \Magento\Customer\Api\Data\GroupInterface[] * @throws \Magento\Framework\Exception\LocalizedException */ @@ -51,6 +54,7 @@ interface GroupManagementInterface /** * Get customer group representing all customers. * + * @api * @return \Magento\Customer\Api\Data\GroupInterface * @throws \Magento\Framework\Exception\LocalizedException */ diff --git a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php index 3dc7045dfeba7704ec7637b4a3246ce0252ceb1d..c89ce113dcd17c42e7e19974f36a756e71e57b22 100644 --- a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php +++ b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php @@ -13,6 +13,7 @@ interface GroupRepositoryInterface /** * Save customer group. * + * @api * @param \Magento\Customer\Api\Data\GroupInterface $group * @return \Magento\Customer\Api\Data\GroupInterface * @throws \Magento\Framework\Exception\InputException If there is a problem with the input @@ -26,6 +27,7 @@ interface GroupRepositoryInterface /** * Get customer group by group ID. * + * @api * @param int $id * @return \Magento\Customer\Api\Data\GroupInterface * @throws \Magento\Framework\Exception\NoSuchEntityException If $groupId is not found @@ -39,6 +41,7 @@ interface GroupRepositoryInterface * The list of groups can be filtered to exclude the NOT_LOGGED_IN group using the first parameter and/or it can * be filtered by tax class. * + * @api * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria * @return \Magento\Customer\Api\Data\GroupSearchResultsInterface * @throws \Magento\Framework\Exception\LocalizedException @@ -48,6 +51,7 @@ interface GroupRepositoryInterface /** * Delete customer group. * + * @api * @param \Magento\Customer\Api\Data\GroupInterface $group * @return bool true on success * @throws \Magento\Framework\Exception\StateException If customer group cannot be deleted @@ -58,6 +62,7 @@ interface GroupRepositoryInterface /** * Delete customer group by ID. * + * @api * @param int $id * @return bool true on success * @throws \Magento\Framework\Exception\NoSuchEntityException diff --git a/app/code/Magento/Customer/Api/MetadataInterface.php b/app/code/Magento/Customer/Api/MetadataInterface.php index fb77ce928e71dab6981a4804aa328a8eaf2ac293..faa87c0f11d186c749de11f066d3478b1fd12f01 100644 --- a/app/code/Magento/Customer/Api/MetadataInterface.php +++ b/app/code/Magento/Customer/Api/MetadataInterface.php @@ -14,6 +14,7 @@ interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterf /** * Retrieve all attributes filtered by form code * + * @api * @param string $formCode * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[] * @throws \Magento\Framework\Exception\LocalizedException @@ -23,6 +24,7 @@ interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterf /** * Retrieve attribute metadata. * + * @api * @param string $attributeCode * @return \Magento\Customer\Api\Data\AttributeMetadataInterface * @throws \Magento\Framework\Exception\NoSuchEntityException @@ -33,6 +35,7 @@ interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterf /** * Get all attribute metadata. * + * @api * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[] * @throws \Magento\Framework\Exception\LocalizedException */ @@ -41,6 +44,7 @@ interface MetadataInterface extends \Magento\Framework\Api\MetadataServiceInterf /** * Get custom attributes metadata for the given data interface. * + * @api * @param string $dataInterfaceName * @return \Magento\Customer\Api\Data\AttributeMetadataInterface[] * @throws \Magento\Framework\Exception\LocalizedException diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php index a534411d8f043bfb4c181e9d7418ba16a7058b5c..c01cd99d642cf7cb72c963fc20513f2e8e525235 100644 --- a/app/code/Magento/Customer/Model/Session.php +++ b/app/code/Magento/Customer/Model/Session.php @@ -291,6 +291,7 @@ class Session extends \Magento\Framework\Session\SessionManager /** * Retrieve customer id from current session * + * @api * @return int|null */ public function getCustomerId() @@ -356,6 +357,7 @@ class Session extends \Magento\Framework\Session\SessionManager /** * Checking customer login status * + * @api * @return bool */ public function isLoggedIn() @@ -420,6 +422,7 @@ class Session extends \Magento\Framework\Session\SessionManager /** * Authorization customer by identifier * + * @api * @param int $customerId * @return bool */ @@ -437,6 +440,7 @@ class Session extends \Magento\Framework\Session\SessionManager /** * Logout customer * + * @api * @return $this */ public function logout() diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php index 89c11e487da39cc28c8ea14e964237e4baa5203b..516690383362a739e1feb53af7a2fd13570e99e7 100644 --- a/app/code/Magento/Wishlist/Model/Item.php +++ b/app/code/Magento/Wishlist/Model/Item.php @@ -683,7 +683,7 @@ class Item extends AbstractModel implements ItemInterface } /** - *Remove option from item options + * Remove option from item options * * @param string $code * @return $this diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php index f909e97086b5a2f2bf5dc3a84e15994d526d55d3..24b167d7d5881d0a66498a2f8d51ca204a8fa6e4 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php @@ -21,7 +21,7 @@ class Sidebar extends Block * * @var string */ - protected $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[@class="value qty"]'; + protected $qty = '//*[@class="product"]/*[@title="%s"]/following-sibling::*//*[@class="item-qty cart-item-qty"]'; /** * Mini cart link selector @@ -42,7 +42,7 @@ class Sidebar extends Block * * @var string */ - protected $cartItemByProductName = './/*[contains(@class,"products minilist")]//li[.//a[.="%s"]]'; + protected $cartItemByProductName = './/*[contains(@class,"minicart-items")]//li[.//a[.="%s"]]'; /** * Counter qty locator @@ -91,7 +91,7 @@ class Sidebar extends Block { $this->openMiniCart(); $productQty = sprintf($this->qty, $productName); - return $this->_rootElement->find($productQty, Locator::SELECTOR_XPATH)->getText(); + return $this->_rootElement->find($productQty, Locator::SELECTOR_XPATH)->getValue(); } /** diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php index b99ac46a7261d7d25c83f283e7aabbe389f06b4d..f5d30d2f9bdc2f376563ee8964537b6758553fb2 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php @@ -85,7 +85,6 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable */ public function test($originalProduct, $checkoutData) { - $this->markTestIncomplete('Bug: MAGETWO-34259'); // Preconditions: $product = $this->createProduct($originalProduct); $this->addToCart($product);