Merge pull request #943 from amacgregor/develop

maksek · maksek · commit 9685d9c65e28 · 2015-01-14T10:53:41.000-06:00
Fixed Failed Test due to Class not following the naming conventions (MAGETWO-32697)
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -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
@@ -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,
@@ -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,
@@ -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;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -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
@@ -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();
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -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
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice.php
@@ -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 <core@magentocommerce.com>
  */
-class Groupprice extends AbstractGroupprice
+class GroupPrice extends AbstractGroupPrice
 {
     /**
      * Initialize connection and define main table
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -8,9 +8,9 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-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
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php
@@ -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 <core@magentocommerce.com>
  */
-class Tierprice extends AbstractGroupprice
+class Tierprice extends AbstractGroupPrice
 {
     /**
      * Initialize connection and define main table
diff --git a/app/code/Magento/Catalog/Model/Resource/Setup.php b/app/code/Magento/Catalog/Model/Resource/Setup.php
@@ -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,
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
@@ -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;
 
@@ -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',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -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;
 
@@ -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,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
@@ -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;
 
@@ -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',
             [],
             [],
             '',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*/`
`11`	`11`	`namespace Magento\Catalog\Model\Product\Attribute\Backend;`
`12`	`12`
`13`		`-class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice`
	`13`	`+class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* Catalog product attribute backend tierprice`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`*`
`9`	`9`	`* @author Magento Core Team <[email protected]>`
`10`	`10`	`*/`
`11`		`-namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice;`
	`11`	`+namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice;`
`12`	`12`
`13`		`-abstract class AbstractGroupprice extends \Magento\Framework\Model\Resource\Db\AbstractDb`
	`13`	`+abstract class AbstractGroupPrice extends \Magento\Framework\Model\Resource\Db\AbstractDb`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* Load Tier Prices for product`