Skip to content

Fixed annotations #18946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 5, 2018
Merged

Fixed annotations #18946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbca4dd
Fixed annotations
sreichel Oct 30, 2018
2f5fc97
Fixed annotations
sreichel Oct 30, 2018
23ad12a
Fixed annotations for setData()
sreichel Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/AbstractModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function isLockedAttribute($attributeCode)
*
* @param string|array $key
* @param mixed $value
* @return \Magento\Framework\DataObject
* @return $this
*/
public function setData($key, $value = null)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ public function addPriceData($customerGroupId = null, $websiteId = null)
/**
* Add attribute to filter
*
* @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string $attribute
* @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|string|array $attribute
* @param array $condition
* @param string $joinType
* @return $this
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Customer/Model/Address/AbstractAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @method string getFirstname()
* @method string getMiddlename()
* @method string getLastname()
* @method int getCountryId()
* @method string getCountryId()
* @method string getCity()
* @method string getTelephone()
* @method string getCompany()
Expand Down Expand Up @@ -272,7 +272,7 @@ public function setStreet($street)
*
* @param array|string $key
* @param null $value
* @return \Magento\Framework\DataObject
* @return $this
*/
public function setData($key, $value = null)
{
Expand Down Expand Up @@ -425,7 +425,7 @@ public function getRegionId()
}

/**
* @return int
* @return string
*/
public function getCountry()
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Quote/Model/Quote/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
* @method Address setAddressType(string $value)
* @method int getFreeShipping()
* @method Address setFreeShipping(int $value)
* @method int getCollectShippingRates()
* @method Address setCollectShippingRates(int $value)
* @method bool getCollectShippingRates()
* @method Address setCollectShippingRates(bool $value)
* @method Address setShippingMethod(string $value)
* @method string getShippingDescription()
* @method Address setShippingDescription(string $value)
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Order/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ protected function implodeStreetValue($value)
*
* @param array|string $key
* @param null $value
* @return \Magento\Framework\DataObject
* @return $this
*/
public function setData($key, $value = null)
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Widget/Block/BlockInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function addData(array $arr);
*
* @param string|array $key
* @param mixed $value
* @return \Magento\Framework\DataObject
* @return $this
*/
public function setData($key, $value = null);
}