Skip to content

Commit 3dfb849

Browse files
committed
Merge remote-tracking branch 'git-36978/no-author/wishlist' into bluetooth_delivery
2 parents 4484e82 + 55d8416 commit 3dfb849

File tree

15 files changed

+18
-59
lines changed

15 files changed

+18
-59
lines changed

app/code/Magento/Wishlist/Block/Customer/Sharing.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,15 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Wishlist customer sharing block
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Wishlist\Block\Customer;
138

149
use Magento\Captcha\Block\Captcha;
1510

1611
/**
17-
* Class Sharing
12+
* Wishlist customer sharing block
1813
*
1914
* @api
2015
* @since 100.0.2
21-
* @package Magento\Wishlist\Block\Customer
2216
*/
2317
class Sharing extends \Magento\Framework\View\Element\Template
2418
{

app/code/Magento/Wishlist/Block/Customer/Wishlist.php

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer;
118

129
/**

app/code/Magento/Wishlist/Block/Customer/Wishlist/Button.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,22 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Wishlist block customer item cart column
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Wishlist\Block\Customer\Wishlist;
138

149
/**
10+
* Wishlist block customer item cart column
11+
*
1512
* @api
1613
* @since 100.0.2
1714
*/
1815
class Button extends \Magento\Framework\View\Element\Template
1916
{
2017
/**
21-
* Wishlist config
22-
*
2318
* @var \Magento\Wishlist\Model\Config
2419
*/
2520
protected $_wishlistConfig;
2621

2722
/**
28-
* Wishlist data
29-
*
3023
* @var \Magento\Wishlist\Helper\Data
3124
*/
3225
protected $_wishlistData = null;

app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
118

129
/**
1310
* Model for item column in customer wishlist.
1411
*
1512
* @api
1613
* @deprecated 101.1.2
14+
* @see no longer used
1715
* @since 100.0.2
1816
*/
1917
class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
118

129
/**
1310
* Wishlist block customer item cart column.
1411
*
1512
* @api
1613
* @deprecated 101.1.2
14+
* @see no longer used
1715
* @since 100.0.2
1816
*/
1917
class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
118

129
/**
1310
* Edit item in customer wishlist table.
1411
*
1512
* @api
1613
* @deprecated 101.1.2
14+
* @see no longer used
1715
* @since 100.0.2
1816
*/
1917
class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
118

129
/**
1310
* Wishlist block customer item cart column.
1411
*
1512
* @api
1613
* @deprecated 101.1.2
14+
* @see no longer used
1715
* @since 100.0.2
1816
*/
1917
class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* @author Magento Core Team <[email protected]>
9-
*/
107
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
118

129
/**
1310
* Delete item column in customer wishlist table
1411
*
1512
* @api
1613
* @deprecated 101.1.2
14+
* @see no longer used
1715
* @since 100.0.2
1816
*/
1917
class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

app/code/Magento/Wishlist/Block/Share/Wishlist.php

-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Wishlist block shared items
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Share;
1311

@@ -53,7 +51,6 @@ public function __construct(
5351
* Prepare global layout
5452
*
5553
* @return $this
56-
*
5754
*/
5855
protected function _prepareLayout()
5956
{

app/code/Magento/Wishlist/Helper/Data.php

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/**
2222
* Wishlist Data Helper
2323
*
24-
* @author Magento Core Team <[email protected]>
2524
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2625
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2726
*

app/code/Magento/Wishlist/Model/ResourceModel/Item.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Wishlist item model resource
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Wishlist\Model\ResourceModel;
138

149
/**
10+
* Wishlist item model resource
11+
*
1512
* @api
1613
* @since 100.0.2
1714
*/
@@ -56,7 +53,7 @@ public function loadByProductWishlist($object, $wishlistId, $productId, $sharedS
5653
}
5754

5855
/**
59-
* {@inheritdoc}
56+
* @inheritDoc
6057
*/
6158
public function save(\Magento\Framework\Model\AbstractModel $object)
6259
{

app/code/Magento/Wishlist/Model/ResourceModel/Item/Option.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Wishlist item option resource model
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Wishlist\Model\ResourceModel\Item;
138

149
/**
10+
* Wishlist item option resource model
11+
*
1512
* @api
1613
* @since 100.0.2
1714
*/
1815
class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1916
{
2017
/**
18+
* Initialise the resource model
19+
*
2120
* @return void
2221
*/
2322
protected function _construct()

app/code/Magento/Wishlist/Model/ResourceModel/Item/Option/Collection.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Wishlist item option collection
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Model\ResourceModel\Item\Option;
1311

app/code/Magento/Wishlist/Model/ResourceModel/Wishlist.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Wishlist resource model
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Wishlist\Model\ResourceModel;
138

149
/**
10+
* Wishlist resource model
11+
*
1512
* @api
1613
* @since 100.0.2
1714
*/
@@ -81,7 +78,7 @@ public function setCustomerIdFieldName($fieldName)
8178
}
8279

8380
/**
84-
* {@inheritdoc}
81+
* @inheritDoc
8582
*/
8683
public function save(\Magento\Framework\Model\AbstractModel $object)
8784
{

app/code/Magento/Wishlist/Model/ResourceModel/Wishlist/Collection.php

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Wishlist model collection
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Model\ResourceModel\Wishlist;
1311

0 commit comments

Comments
 (0)