Skip to content

magento2-925 Failed Test due to Class not following the naming conventions #943

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 7 commits into from
Jan 14, 2015
Merged

magento2-925 Failed Test due to Class not following the naming conventions #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
462093b
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
45b8e88
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
08cb2a7
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
ed39bce
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
f28cd93
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
13a68ee
magento2-925 Failed Test due to Class not following the naming conven…
amacgregor Jan 9, 2015
3200820
Merge branch 'develop' with latest changes from upsteam to https://gi…
amacgregor Jan 10, 2015
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
16 changes: 8 additions & 8 deletions .../Product/Attribute/Backend/Groupprice.php → .../Product/Attribute/Backend/GroupPrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
*
* @SuppressWarnings(PHPMD.LongVariable)
*/
class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice
class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
{
/**
* Catalog product attribute backend groupprice
*
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
*/
protected $_productAttributeBackendGroupprice;
protected $_productAttributeBackendGroupPrice;

/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
Expand All @@ -25,7 +25,7 @@ class Groupprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupp
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
Expand All @@ -34,9 +34,9 @@ public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
\Magento\Customer\Api\GroupManagementInterface $groupManagement,
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice $productAttributeBackendGroupprice
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice $productAttributeBackendGroupPrice
) {
$this->_productAttributeBackendGroupprice = $productAttributeBackendGroupprice;
$this->_productAttributeBackendGroupPrice = $productAttributeBackendGroupPrice;
parent::__construct(
$currencyFactory,
$storeManager,
Expand All @@ -50,11 +50,11 @@ public function __construct(
/**
* Retrieve resource instance
*
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
*/
protected function _getResource()
{
return $this->_productAttributeBackendGroupprice;
return $this->_productAttributeBackendGroupPrice;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...Backend/Groupprice/AbstractGroupprice.php → ...Backend/GroupPrice/AbstractGroupPrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice;
namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice;

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

/**
* Catalog product abstract group price backend attribute model
*/
abstract class AbstractGroupprice extends Price
abstract class AbstractGroupPrice extends Price
{
/**
* Website currency codes and rates
Expand Down Expand Up @@ -99,7 +99,7 @@ protected function _getWebsiteCurrencyRates()
/**
* Retrieve resource instance
*
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice
* @return \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice
*/
abstract protected function _getResource();

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
namespace Magento\Catalog\Model\Product\Attribute\Backend;

class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice
class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
{
/**
* Catalog product attribute backend tierprice
Expand Down
4 changes: 2 additions & 2 deletions .../Product/Attribute/Backend/Groupprice.php → .../Product/Attribute/Backend/GroupPrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;

use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice;
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice;

/**
* Catalog product group price backend attribute model
*
* @author Magento Core Team <[email protected]>
*/
class Groupprice extends AbstractGroupprice
class GroupPrice extends AbstractGroupPrice
{
/**
* Initialize connection and define main table
Expand Down
4 changes: 2 additions & 2 deletions ...Backend/Groupprice/AbstractGroupprice.php → ...Backend/GroupPrice/AbstractGroupPrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice;
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice;

abstract class AbstractGroupprice extends \Magento\Framework\Model\Resource\Db\AbstractDb
abstract class AbstractGroupPrice extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
/**
* Load Tier Prices for product
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;

use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice;
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice;

/**
* Catalog product tier price backend attribute model
*
* @author Magento Core Team <[email protected]>
*/
class Tierprice extends AbstractGroupprice
class Tierprice extends AbstractGroupPrice
{
/**
* Initialize connection and define main table
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/Resource/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ public function getDefaultEntities()
'type' => 'decimal',
'label' => 'Group Price',
'input' => 'text',
'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
'backend' => 'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
'required' => false,
'sort_order' => 2,
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_WEBSITE,
Expand Down
4 changes: 2 additions & 2 deletions dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase
protected $attributeMock;

/**
* @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject
* @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject
*/
protected $backendMock;

Expand Down Expand Up @@ -109,7 +109,7 @@ public function setUp()
false
);
$this->backendMock = $this->getMock(
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
[],
[],
'',
Expand Down
6 changes: 3 additions & 3 deletions ...ibute/Backend/Groupprice/AbstractTest.php → ...ibute/Backend/GroupPrice/AbstractTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice;
namespace Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice;

class AbstractTest extends \PHPUnit_Framework_TestCase
{
/**
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice\AbstractGroupprice
* @var \Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice
*/
protected $_model;

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

$this->_model = $this->getMockForAbstractClass(
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice',
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice',
[
'currencyFactory' => $currencyFactoryMock,
'storeManager' => $storeManagerMock,
Expand Down
4 changes: 2 additions & 2 deletions dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class GroupPriceTest extends \PHPUnit_Framework_TestCase
protected $attributeMock;

/**
* @var \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice|\PHPUnit_Framework_MockObject_MockObject
* @var \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice|\PHPUnit_Framework_MockObject_MockObject
*/
protected $backendMock;

Expand Down Expand Up @@ -103,7 +103,7 @@ public function setUp()
false
);
$this->backendMock = $this->getMock(
'Magento\Catalog\Model\Product\Attribute\Backend\Groupprice',
'Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice',
[],
[],
'',
Expand Down