Merge remote-tracking branch 'github/develop' into public-pulls

vpelipenko · vpelipenko · commit e42d22dd140f · 2015-01-15T12:41:09.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -10,14 +10,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
@@ -26,7 +26,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,
@@ -35,9 +35,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,
@@ -51,11 +51,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
@@ -3,15 +3,15 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-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
@@ -100,7 +100,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
@@ -11,7 +11,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
@@ -5,14 +5,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
@@ -9,9 +9,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
@@ -5,14 +5,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
@@ -561,7 +561,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/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -61,9 +61,10 @@ define([
          */
         _renderSelectOption: function(selectElement, key, value) {
             selectElement.append($.proxy(function() {
-                if (value.code &&  $(value.name).is('span')) {
+                var name = value.name.replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, "\\$&");
+                if (value.code &&  $(name).is('span')) {
                     key = value.code;
-                    value.name = $(value.name).text();
+                    value.name = $(name).text();
                 }
                 $.template('regionTemplate', this.options.regionTemplate);
                 if (this.options.defaultRegion === key) {
@@ -173,4 +174,4 @@ define([
     });
     
     return $.mage.regionUpdater;
-});
+});
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -38,7 +38,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class UpdateCustomerFrontendEntity extends Injectable
+class UpdateCustomerFrontendEntityTest extends Injectable
 {
     /**
      * Factory for Fixtures
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest/test.csv
@@ -1,3 +1,4 @@
 "customer/data/firstname";"customer/data/lastname";"customer/data/email";"address/data/firstname";"address/data/lastname";"address/data/company";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/region";"address/data/telephone";"address/data/fax";"address/data/postcode";"constraint"
 "Jany %isolation%";"Doe %isolation%";"janydoe%isolation%@example.com";"Jany %isolation%";"Doe %isolation%";"Company %isolation%";"Some street %isolation%";"City %isolation%";"United States";"Colorado";"-";"555-888-111-999";"161-999-8888";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"
 "Jonny %isolation%";"Doe %isolation%";"jonny%isolation%@example.com";"John %isolation%";"Doe %isolation%";"Company %isolation%";"Some street %isolation%";"City %isolation%";"United Kingdom";"-";"Region %isolation%";"0123456789-02134567";"5555-874-99634";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"
+"Jean %isolation%";"Reno %isolation%";"jean%isolation%@example.com";"Jean %isolation%";"Reno %isolation%";"Magento %isolation%";"18-20 Rue Maréchal Leclerc";"Quintin";"France";"Côtes-d'Armor";"-";"555-888-111-999";"161-999-8888";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/HtmlTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/HtmlTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Magento\Framework\View\Page\Config\Reader;
+
+
+class HtmlTest extends \PHPUnit_Framework_TestCase
+{
+    public function testInterpret()
+    {
+        /** @var \Magento\Framework\View\Layout\Reader\Context $readerContext */
+        $readerContext = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Framework\View\Layout\Reader\Context'
+        );
+        $pageXml = new \Magento\Framework\View\Layout\Element(__DIR__ . '/_files/_layout_update.xml', 0, true);
+        $parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');
+
+        $html = new Html();
+        foreach ($pageXml->xpath('html') as $htmlElement) {
+            $html->interpret($readerContext, $htmlElement, $parentElement);
+        }
+        
+        $structure = $readerContext->getPageConfigStructure();
+        $this->assertEquals(['html' => ['test-name' => 'test-value']], $structure->getElementAttributes());
+    }
+} 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/_files/_layout_update.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Page/Config/Reader/_files/_layout_update.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <html>
+        <attribute name="test-name" value="test-value"/>
+    </html>
+</page>
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
@@ -43,7 +43,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;
 
@@ -110,7 +110,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
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-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;
 
@@ -31,7 +31,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
@@ -47,7 +47,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;
 
@@ -104,7 +104,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/Framework/View/Layout/Reader/UiComponentTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/UiComponentTest.php
@@ -66,9 +66,9 @@ public function testGetSupportedNodes()
      *
      * @param \Magento\Framework\View\Layout\Element $element
      *
-     * @dataProvider processDataProvider
+     * @dataProvider interpretDataProvider
      */
-    public function testProcess($element)
+    public function testInterpret($element)
     {
         $scope = $this->getMock('Magento\Framework\App\ScopeInterface', [], [], '', false);
         $this->scopeResolver->expects($this->any())->method('getScope')->will($this->returnValue($scope));
@@ -85,14 +85,14 @@ public function testProcess($element)
             $element->getParent()
         )->willReturn($element->getAttribute('name'));
 
-        $this->helper->expects($this->any())->method('setStructureElementData')->with(
+        $scheduleStructure->expects($this->once())->method('setStructureElementData')->with(
             $element->getAttribute('name'),
             ['attributes' => ['group' => '', 'component' => 'listing']]
         );
         $this->model->interpret($this->context, $element);
     }
 
-    public function processDataProvider()
+    public function interpretDataProvider()
     {
         return [
             [
diff --git a/dev/tools/Magento/Tools/Migration/System/Configuration/Mapper.php b/dev/tools/Magento/Tools/Migration/System/Configuration/Mapper.php
@@ -38,7 +38,7 @@ public function __construct(
     public function transform(array $config)
     {
         $output = [];
-        $output['comment'] = $config['comment'];
+        $output['comment'] = isset($config['comment']) ? $config['comment'] : '';
 
         $tabsConfig = isset($config['tabs']) ? $config['tabs'] : [];
         $sectionsConfig = isset($config['sections']) ? $config['sections'] : [];
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -53,7 +53,7 @@ public function aroundDispatch(
             if ($errors) {
                 $formattedErrors = $this->formatErrors($errors);
                 throw new \Magento\Framework\Module\Exception(
-                    'Please update your database: Run "php –f index.php update" from the Magento root/setup directory.'
+                    'Please update your database: Run "php -f index.php update" from the Magento root/setup directory.'
                     . PHP_EOL . 'The following modules are outdated:' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
                 );
             } else {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`	`namespace Magento\Catalog\Model\Product\Attribute\Backend;`
`13`	`13`
`14`		`-class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\Groupprice\AbstractGroupprice`
	`14`	`+class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPrice\AbstractGroupPrice`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* Catalog product attribute backend tierprice`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`*`
`10`	`10`	`* @author Magento Core Team <core@magentocommerce.com>`
`11`	`11`	`*/`
`12`		`-namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\Groupprice;`
	`12`	`+namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend\GroupPrice;`
`13`	`13`
`14`		`-abstract class AbstractGroupprice extends \Magento\Framework\Model\Resource\Db\AbstractDb`
	`14`	`+abstract class AbstractGroupPrice extends \Magento\Framework\Model\Resource\Db\AbstractDb`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* Load Tier Prices for product`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`40`	`40`	`*/`
`41`		`-class UpdateCustomerFrontendEntity extends Injectable`
	`41`	`+class UpdateCustomerFrontendEntityTest extends Injectable`
`42`	`42`	`{`
`43`	`43`	`/**`
`44`	`44`	`* Factory for Fixtures`