Skip to content

Commit a2ade32

Browse files
committed
Merge branch 'no-author/downloadable' into comm_prd_may_abhi_v1
2 parents 239d499 + ad665fd commit a2ade32

File tree

16 files changed

+37
-73
lines changed

16 files changed

+37
-73
lines changed

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab;
77

@@ -14,7 +14,6 @@
1414
/**
1515
* Adminhtml catalog product downloadable items tab and form
1616
*
17-
* @author Magento Core Team <[email protected]>
1817
* @deprecated 100.3.1
1918
* @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
2019
*/
@@ -45,8 +44,6 @@ class Downloadable extends Widget implements TabInterface
4544
protected $blockId = 'downloadableInfo';
4645

4746
/**
48-
* Core registry
49-
*
5047
* @var Registry
5148
*/
5249
protected $_coreRegistry = null;

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
77

88
/**
99
* Adminhtml catalog product downloadable items tab links section
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1312
*
1413
* @deprecated 100.3.1 in favor of new class which adds grid links
@@ -36,8 +35,6 @@ class Links extends \Magento\Backend\Block\Template
3635
protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml';
3736

3837
/**
39-
* Downloadable file
40-
*
4138
* @var \Magento\Downloadable\Helper\File
4239
*/
4340
protected $_downloadableFile = null;
@@ -50,8 +47,6 @@ class Links extends \Magento\Backend\Block\Template
5047
protected $_coreFileStorageDb = null;
5148

5249
/**
53-
* Core registry
54-
*
5550
* @var \Magento\Framework\Registry
5651
*/
5752
protected $_coreRegistry;

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
77

88
/**
99
* Adminhtml catalog product downloadable items tab links section
1010
*
11-
* @author Magento Core Team <[email protected]>
12-
*
1311
* @deprecated 100.3.1 because of new class which adds grids samples
1412
* @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
1513
*/
@@ -28,8 +26,6 @@ class Samples extends \Magento\Backend\Block\Widget
2826
protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml';
2927

3028
/**
31-
* Downloadable file
32-
*
3329
* @var \Magento\Downloadable\Helper\File
3430
*/
3531
protected $_downloadableFile = null;
@@ -42,8 +38,6 @@ class Samples extends \Magento\Backend\Block\Widget
4238
protected $_coreFileStorageDb = null;
4339

4440
/**
45-
* Core registry
46-
*
4741
* @var \Magento\Framework\Registry
4842
*/
4943
protected $_coreRegistry;

app/code/Magento/Downloadable/Block/Catalog/Product/View/Type.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Catalog downloadable product part block
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Downloadable\Block\Catalog\Product\View;
1311

app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Shopping cart downloadable item render block
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Downloadable\Block\Checkout\Cart\Item;
1311

app/code/Magento/Downloadable/Block/Checkout/Success.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Downloadable checkout success page
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Downloadable\Block\Checkout;
1311

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable;
77

88
/**
99
* Downloadable File upload controller
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
abstract class File extends \Magento\Backend\App\Action
1412
{
@@ -17,5 +15,5 @@ abstract class File extends \Magento\Backend\App\Action
1715
*
1816
* @see _isAllowed()
1917
*/
20-
const ADMIN_RESOURCE = 'Magento_Catalog::products';
18+
public const ADMIN_RESOURCE = 'Magento_Catalog::products';
2119
}

app/code/Magento/Downloadable/Controller/Download.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Controller;
77

@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Download controller
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
abstract class Download extends \Magento\Framework\App\Action\Action
1715
{

app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Downloadable\Helper\Catalog\Product;
88

99
/**
1010
* Helper for fetching properties by product configurational item
11-
*
12-
* @author Magento Core Team <[email protected]>
1311
*/
1412
class Configuration extends \Magento\Framework\App\Helper\AbstractHelper implements
1513
\Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Helper;
77

@@ -11,8 +11,6 @@
1111

1212
/**
1313
* Downloadable helper
14-
*
15-
* @author Magento Core Team <[email protected]>
1614
*/
1715
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1816
{

app/code/Magento/Downloadable/Model/Product/Price.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Downloadable products price model
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Downloadable\Model\Product;
1311

app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Model\ResourceModel\Link;
77

88
use Magento\Catalog\Api\Data\ProductInterface;
99

1010
/**
1111
* Downloadable links resource collection
12-
*
13-
* @author Magento Core Team <[email protected]>
1412
*/
1513
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1614
{

app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Model\ResourceModel\Link;
77

88
/**
99
* Downloadable Product link purchased resource model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Purchased extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

app/code/Magento/Downloadable/Model/ResourceModel/Link/Purchased/Item.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Model\ResourceModel\Link\Purchased;
77

88
/**
99
* Downloadable Product link purchased items resource model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

app/code/Magento/Downloadable/Model/System/Config/Source/Contentdisposition.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Model\System\Config\Source;
77

88
/**
99
* Downloadable Content Disposition Source
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Contentdisposition implements \Magento\Framework\Option\ArrayInterface
1412
{
1513
/**
14+
* Return option array
15+
*
1616
* @return array
1717
*/
1818
public function toOptionArray()

app/code/Magento/Downloadable/Model/System/Config/Source/Orderitemstatus.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Downloadable\Model\System\Config\Source;
77

88
/**
99
* Downloadable Order Item Status Source
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Orderitemstatus implements \Magento\Framework\Option\ArrayInterface
1412
{
1513
/**
14+
* Return option array
15+
*
1616
* @return array
1717
*/
1818
public function toOptionArray()

0 commit comments

Comments
 (0)