Skip to content

Commit 9685d9c

Browse files
author
maksek
committed
Merge pull request #943 from amacgregor/develop
Fixed Failed Test due to Class not following the naming conventions (MAGETWO-32697)
2 parents 2748e60 + 3200820 commit 9685d9c

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice.php renamed to app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
*
1010
* @SuppressWarnings(PHPMD.LongVariable)
1111
*/
12-
class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice
12+
class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
1313
{
1414
/**
1515
* Catalog product attribute backend groupprice
1616
*
17-
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
17+
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
1818
*/
19-
protected $_productAttributeBackendGroupprice;
19+
protected $_productAttributeBackendGroupPrice;
2020

2121
/**
2222
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
@@ -25,7 +25,7 @@ class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupp
2525
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
2626
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
2727
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
28-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice
28+
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice
2929
*/
3030
public function __construct(
3131
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
@@ -34,9 +34,9 @@ public function __construct(
3434
\Magento\Framework\App\Config\ScopeConfigInterface $config,
3535
\Magento\Catalog\Model\Product\Type $catalogProductType,
3636
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
37-
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice
37+
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice
3838
) {
39-
$this->_productAttributeBackendGroupprice = $productAttributeBackendGroupprice;
39+
$this->_productAttributeBackendGroupPrice = $productAttributeBackendGroupPrice;
4040
parent::__construct(
4141
$currencyFactory,
4242
$storeManager,
@@ -50,11 +50,11 @@ public function __construct(
5050
/**
5151
* Retrieve resource instance
5252
*
53-
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
53+
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
5454
*/
5555
protected function _getResource()
5656
{
57-
return $this->_productAttributeBackendGroupprice;
57+
return $this->_productAttributeBackendGroupPrice;
5858
}
5959

6060
/**

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php renamed to app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
/**
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
5-
namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice;
5+
namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice;
66

77
use Magento\Catalog\Model\Product\Attribute\Backend\Price;
88
use Magento\Customer\Api\GroupManagementInterface;
99

1010
/**
1111
* Catalog product abstract group price backend attribute model
1212
*/
13-
abstract class AbstractGroupprice extends Price
13+
abstract class AbstractGroupPrice extends Price
1414
{
1515
/**
1616
* Website currency codes and rates
@@ -99,7 +99,7 @@ protected function _getWebsiteCurrencyRates()
9999
/**
100100
* Retrieve resource instance
101101
*
102-
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
102+
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
103103
*/
104104
abstract protected function _getResource();
105105

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
namespace Magento\Catalog\Model\Product\Attribute\Backend;
1212

13-
class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice
13+
class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
1414
{
1515
/**
1616
* Catalog product attribute backend tierprice

app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php renamed to app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*/
55
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;
66

7-
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice;
7+
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice;
88

99
/**
1010
* Catalog product group price backend attribute model
1111
*
1212
* @author Magento Core Team <core@magentocommerce.com>
1313
*/
14-
class Groupprice extends AbstractGroupprice
14+
class GroupPrice extends AbstractGroupPrice
1515
{
1616
/**
1717
* Initialize connection and define main table

app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php renamed to app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*
99
* @author Magento Core Team <core@magentocommerce.com>
1010
*/
11-
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice;
11+
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice;
1212

13-
abstract class AbstractGroupprice extends \Magento\Framework\Model\Resource\Db\AbstractDb
13+
abstract class AbstractGroupPrice extends \Magento\Framework\Model\Resource\Db\AbstractDb
1414
{
1515
/**
1616
* Load Tier Prices for product

app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*/
55
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;
66

7-
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice;
7+
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice;
88

99
/**
1010
* Catalog product tier price backend attribute model
1111
*
1212
* @author Magento Core Team <core@magentocommerce.com>
1313
*/
14-
class Tierprice extends AbstractGroupprice
14+
class Tierprice extends AbstractGroupPrice
1515
{
1616
/**
1717
* Initialize connection and define main table

app/code/Magento/Catalog/Model/Resource/Setup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ public function getDefaultEntities()
560560
'type' => 'decimal',
561561
'label' => 'Group Price',
562562
'input' => 'text',
563-
'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
563+
'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
564564
'required' => false,
565565
'sort_order' => 2,
566566
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_WEBSITE,

dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase
4242
protected $attributeMock;
4343

4444
/**
45-
* @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject
45+
* @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject
4646
*/
4747
protected $backendMock;
4848

@@ -109,7 +109,7 @@ public function setUp()
109109
false
110110
);
111111
$this->backendMock = $this->getMock(
112-
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
112+
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
113113
[],
114114
[],
115115
'',
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/**
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
5-
namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice;
5+
namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice;
66

77
class AbstractTest extends \PHPUnit_Framework_TestCase
88
{
99
/**
10-
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice
10+
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
1111
*/
1212
protected $_model;
1313

@@ -30,7 +30,7 @@ protected function setUp()
3030
$groupManagement = $this->getMock('Magento\Customer\Api\GroupManagementInterface', [], [], '', false);
3131

3232
$this->_model = $this->getMockForAbstractClass(
33-
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice',
33+
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice',
3434
[
3535
'currencyFactory' => $currencyFactoryMock,
3636
'storeManager' => $storeManagerMock,

dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase
4646
protected $attributeMock;
4747

4848
/**
49-
* @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject
49+
* @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject
5050
*/
5151
protected $backendMock;
5252

@@ -103,7 +103,7 @@ public function setUp()
103103
false
104104
);
105105
$this->backendMock = $this->getMock(
106-
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
106+
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
107107
[],
108108
[],
109109
'',

0 commit comments

Comments
 (0)