-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'git-36978/no-author/wishlist' into blue…
…tooth_delivery
- Loading branch information
Showing
15 changed files
with
18 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,21 +4,15 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Wishlist customer sharing block | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer; | ||
|
|
||
| use Magento\Captcha\Block\Captcha; | ||
|
|
||
| /** | ||
| * Class Sharing | ||
| * Wishlist customer sharing block | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| * @package Magento\Wishlist\Block\Customer | ||
| */ | ||
| class Sharing extends \Magento\Framework\View\Element\Template | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,6 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer; | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,29 +4,22 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Wishlist block customer item cart column | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist; | ||
|
|
||
| /** | ||
| * Wishlist block customer item cart column | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| */ | ||
| class Button extends \Magento\Framework\View\Element\Template | ||
| { | ||
| /** | ||
| * Wishlist config | ||
| * | ||
| * @var \Magento\Wishlist\Model\Config | ||
| */ | ||
| protected $_wishlistConfig; | ||
|
|
||
| /** | ||
| * Wishlist data | ||
| * | ||
| * @var \Magento\Wishlist\Helper\Data | ||
| */ | ||
| protected $_wishlistData = null; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,16 +4,14 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column; | ||
|
|
||
| /** | ||
| * Model for item column in customer wishlist. | ||
| * | ||
| * @api | ||
| * @deprecated 101.1.2 | ||
| * @see no longer used | ||
| * @since 100.0.2 | ||
| */ | ||
| class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,16 +4,14 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column; | ||
|
|
||
| /** | ||
| * Wishlist block customer item cart column. | ||
| * | ||
| * @api | ||
| * @deprecated 101.1.2 | ||
| * @see no longer used | ||
| * @since 100.0.2 | ||
| */ | ||
| class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,16 +4,14 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column; | ||
|
|
||
| /** | ||
| * Edit item in customer wishlist table. | ||
| * | ||
| * @api | ||
| * @deprecated 101.1.2 | ||
| * @see no longer used | ||
| * @since 100.0.2 | ||
| */ | ||
| class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,16 +4,14 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column; | ||
|
|
||
| /** | ||
| * Wishlist block customer item cart column. | ||
| * | ||
| * @api | ||
| * @deprecated 101.1.2 | ||
| * @see no longer used | ||
| * @since 100.0.2 | ||
| */ | ||
| class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,16 +4,14 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column; | ||
|
|
||
| /** | ||
| * Delete item column in customer wishlist table | ||
| * | ||
| * @api | ||
| * @deprecated 101.1.2 | ||
| * @see no longer used | ||
| * @since 100.0.2 | ||
| */ | ||
| class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,8 +6,6 @@ | |
|
|
||
| /** | ||
| * Wishlist block shared items | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Block\Share; | ||
|
|
||
|
|
@@ -53,7 +51,6 @@ public function __construct( | |
| * Prepare global layout | ||
| * | ||
| * @return $this | ||
| * | ||
| */ | ||
| protected function _prepareLayout() | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,6 @@ | |
| /** | ||
| * Wishlist Data Helper | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,11 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Wishlist item model resource | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Model\ResourceModel; | ||
|
|
||
| /** | ||
| * Wishlist item model resource | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| */ | ||
|
|
@@ -56,7 +53,7 @@ public function loadByProductWishlist($object, $wishlistId, $productId, $sharedS | |
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| * @inheritDoc | ||
| */ | ||
| public function save(\Magento\Framework\Model\AbstractModel $object) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,20 +4,19 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Wishlist item option resource model | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Model\ResourceModel\Item; | ||
|
|
||
| /** | ||
| * Wishlist item option resource model | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| */ | ||
| class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb | ||
| { | ||
| /** | ||
| * Initialise the resource model | ||
| * | ||
| * @return void | ||
| */ | ||
| protected function _construct() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,8 +6,6 @@ | |
|
|
||
| /** | ||
| * Wishlist item option collection | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Model\ResourceModel\Item\Option; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,11 @@ | |
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Wishlist resource model | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Model\ResourceModel; | ||
|
|
||
| /** | ||
| * Wishlist resource model | ||
| * | ||
| * @api | ||
| * @since 100.0.2 | ||
| */ | ||
|
|
@@ -81,7 +78,7 @@ public function setCustomerIdFieldName($fieldName) | |
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| * @inheritDoc | ||
| */ | ||
| public function save(\Magento\Framework\Model\AbstractModel $object) | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,8 +6,6 @@ | |
|
|
||
| /** | ||
| * Wishlist model collection | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Wishlist\Model\ResourceModel\Wishlist; | ||
|
|
||
|
|
||