Merge branch 'MAGETWO-34346' into MAGETWO-31159

orlangur · orlangur · commit a6a8b3ccc833 · 2015-03-07T09:38:02.000-05:00
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
@@ -9,6 +9,4 @@
 interface CategoryAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface
 {
     const ENTITY_TYPE_CODE = 'catalog_category';
-
-    const DEFAULT_ATTRIBUTE_SET_ID = 3;
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
@@ -9,6 +9,4 @@
 interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface
 {
     const ENTITY_TYPE_CODE = 'catalog_product';
-
-    const DEFAULT_ATTRIBUTE_SET_ID = 4;
 }
diff --git a/app/code/Magento/Catalog/Model/Category/AttributeRepository.php b/app/code/Magento/Catalog/Model/Category/AttributeRepository.php
@@ -24,22 +24,30 @@ class AttributeRepository implements CategoryAttributeRepositoryInterface
      */
     protected $eavAttributeRepository;
 
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    protected $eavConfig;
+
     /**
      * @param \Magento\Framework\Api\Config\MetadataConfig $metadataConfig
      * @param \Magento\Framework\Api\SearchCriteriaDataBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Eav\Api\AttributeRepositoryInterface $eavAttributeRepository
+     * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
         \Magento\Framework\Api\Config\MetadataConfig $metadataConfig,
         \Magento\Framework\Api\SearchCriteriaDataBuilder $searchCriteriaBuilder,
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
-        \Magento\Eav\Api\AttributeRepositoryInterface $eavAttributeRepository
+        \Magento\Eav\Api\AttributeRepositoryInterface $eavAttributeRepository,
+        \Magento\Eav\Model\Config $eavConfig
     ) {
         $this->metadataConfig = $metadataConfig;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->eavAttributeRepository = $eavAttributeRepository;
+        $this->eavConfig = $eavConfig;
     }
 
     /**
@@ -69,11 +77,14 @@ public function get($attributeCode)
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
+        $defaultAttributeSetId = $this->eavConfig
+            ->getEntityType(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
         $searchCriteria = $this->searchCriteriaBuilder->addFilter(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')
-                    ->setValue(\Magento\Catalog\Api\Data\CategoryAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID)
+                    ->setValue($defaultAttributeSetId)
                     ->create(),
             ]
         );
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
@@ -216,11 +216,14 @@ public function deleteById($attributeCode)
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
+        $defaultAttributeSetId = $this->eavConfig
+            ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
         $searchCriteria = $this->searchCriteriaBuilder->addFilter(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')
-                    ->setValue(\Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID)
+                    ->setValue($defaultAttributeSetId)
                     ->create(),
             ]
         );
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -71,6 +71,11 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     protected $metadataService;
 
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    protected $eavConfig;
+
     /**
      * @param ProductFactory $productFactory
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $initializationHelper
@@ -81,6 +86,8 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param Resource\Product $resourceModel
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataServiceInterface
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ProductFactory $productFactory,
@@ -91,7 +98,8 @@ public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
         \Magento\Catalog\Model\Resource\Product $resourceModel,
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
-        \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataServiceInterface
+        \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataServiceInterface,
+        \Magento\Eav\Model\Config $eavConfig
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -102,6 +110,7 @@ public function __construct(
         $this->attributeRepository = $attributeRepository;
         $this->filterBuilder = $filterBuilder;
         $this->metadataService = $metadataServiceInterface;
+        $this->eavConfig = $eavConfig;
     }
 
     /**
@@ -261,12 +270,14 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     {
         /** @var \Magento\Catalog\Model\Resource\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
-
+        $defaultAttributeSetId = $this->eavConfig
+            ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
         $extendedSearchCriteria = $this->searchCriteriaBuilder->addFilter(
             [
                 $this->filterBuilder
                     ->setField('attribute_set_id')
-                    ->setValue(\Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID)
+                    ->setValue($defaultAttributeSetId)
                     ->create(),
             ]
         );
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -13,10 +13,11 @@
 
 <script>
     require([
+        'jquery',
         "prototype",
         "extjs/ext-tree-checkbox",
         "mage/adminhtml/form"
-    ], function(){
+    ], function(jQuery){
 
 //<![CDATA[
 
@@ -69,7 +70,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
     }
 });
 
-Ext.onReady(function()
+jQuery(function()
 {
     var categoryLoader = new Ext.tree.TreeLoader({
        dataUrl: '<?php echo $block->getLoadTreeUrl() ?>'
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -272,7 +272,7 @@ function _renderNewTree(config, scopeParams) {
     //updateContent(url); //commented since ajax requests replaced with http ones to load a category
 }
 
-Ext.onReady(function () {
+jQuery(function () {
     categoryLoader = new Ext.tree.TreeLoader({
         dataUrl:'<?php echo $block->getLoadTreeUrl() ?>'
     });
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -12,7 +12,7 @@
 <div id="<?php echo $_divId ?>" class="tree"></div>
 
 <script>
-require(["prototype", "extjs/ext-tree-checkbox"], function(){
+require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
 var tree<?php echo $block->getId() ?>;
 
@@ -54,7 +54,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
     }
 });
 
-Ext.onReady(function()
+jQuery(function()
 {
     var emptyNodeAdded = <?php echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml
@@ -35,8 +35,7 @@ require([
     "extjs/ext-tree-checkbox",
     'Magento_DesignEditor/js/tools-files'
 ], function(jQuery){
-
-Ext.onReady(function(){
+jQuery(function(){
     var Tree = Ext.tree;
     var tree = new Tree.TreePanel('tree', {
         animate:true,
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -85,6 +85,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
             return $this->processRedirect($request, $rewrite);
         }
 
+        $request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());
         $request->setPathInfo('/' . $rewrite->getTargetPath());
         return $this->actionFactory->create('Magento\Framework\App\Action\Forward', ['request' => $request]);
     }
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -17,10 +17,11 @@
 </fieldset>
 <script>
 require([
+    'jquery',
     'mage/template',
     "prototype",
     "extjs/ext-tree-checkbox"
-], function (mageTemplate) {
+], function (jQuery, mageTemplate) {
 
 //<![CDATA[
 
@@ -476,7 +477,7 @@ var WidgetInstance = {
 
 window.WidgetInstance = WidgetInstance;
 
-Ext.onReady(function(){
+jQuery(function(){
     <?php foreach ($block->getPageGroups() as $pageGroup): ?>
         WidgetInstance.addPageGroup(<?php echo Zend_Json::encode($pageGroup) ?>);
     <?php endforeach; ?>
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
@@ -20,7 +20,7 @@ class ProductAttributeManagementTest extends \Magento\TestFramework\TestCase\Web
 
     public function testGetAttributes()
     {
-        $attributeSetId = \Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID;
+        $attributeSetId = 4;
 
         $serviceInfo = [
             'rest' => [
@@ -155,7 +155,7 @@ public function testUnassignAttribute()
                 $serviceInfo,
                 [
                     'attributeSetId' => $payload['attributeSetId'],
-                    'attributeCode' => $payload['attributeCode']
+                    'attributeCode' => $payload['attributeCode'],
                 ]
             )
         );
@@ -164,10 +164,10 @@ public function testUnassignAttribute()
     protected function getAttributeData()
     {
         return [
-            'attributeSetId' => \Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID,
+            'attributeSetId' => 4,
             'attributeGroupId' => 8,
             'attributeCode' => 'cost',
-            'sortOrder' => 3
+            'sortOrder' => 3,
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php
@@ -22,10 +22,7 @@ class NewActionTest extends \Magento\Backend\Utility\Controller
      */
     public function testCustomerGroupArePresentInGroupPriceTemplate()
     {
-        $this->dispatch('backend/catalog/product/new/set/'
-            . \Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID
-            . '/type/' . \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-        );
+        $this->dispatch('backend/catalog/product/new/set/4/type/' . \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE);
         $lines = explode(PHP_EOL, $this->getResponse()->getBody());
         foreach ($lines as $index => $line) {
             if ($line && strpos($line, 'name="product[group_price][<%= data.index %>][cust_group]"') !== false) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,4 @@`
`9`	`9`	`interface CategoryAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface`
`10`	`10`	`{`
`11`	`11`	`const ENTITY_TYPE_CODE = 'catalog_category';`
`12`		`-`
`13`		`- const DEFAULT_ATTRIBUTE_SET_ID = 3;`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,4 @@`
`9`	`9`	`interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttributeInterface`
`10`	`10`	`{`
`11`	`11`	`const ENTITY_TYPE_CODE = 'catalog_product';`
`12`		`-`
`13`		`- const DEFAULT_ATTRIBUTE_SET_ID = 4;`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,11 +216,14 @@ public function deleteById($attributeCode)`
`216`	`216`	`*/`
`217`	`217`	`public function getCustomAttributesMetadata($dataObjectClassName = null)`
`218`	`218`	`{`
	`219`	`+ $defaultAttributeSetId = $this->eavConfig`
	`220`	`+ ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)`
	`221`	`+ ->getDefaultAttributeSetId();`
`219`	`222`	`$searchCriteria = $this->searchCriteriaBuilder->addFilter(`
`220`	`223`	`[`
`221`	`224`	`$this->filterBuilder`
`222`	`225`	`->setField('attribute_set_id')`
`223`		`- ->setValue(\Magento\Catalog\Api\Data\ProductAttributeInterface::DEFAULT_ATTRIBUTE_SET_ID)`
	`226`	`+ ->setValue($defaultAttributeSetId)`
`224`	`227`	`->create(),`
`225`	`228`	`]`
`226`	`229`	`);`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ function _renderNewTree(config, scopeParams) {`
`272`	`272`	`//updateContent(url); //commented since ajax requests replaced with http ones to load a category`
`273`	`273`	`}`
`274`	`274`
`275`		`-Ext.onReady(function () {`
	`275`	`+jQuery(function () {`
`276`	`276`	`categoryLoader = new Ext.tree.TreeLoader({`
`277`	`277`	`dataUrl:'<?php echo $block->getLoadTreeUrl() ?>'`
`278`	`278`	`});`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`<div id="<?php echo $_divId ?>" class="tree"></div>`
`13`	`13`
`14`	`14`	`<script>`
`15`		`-require(["prototype", "extjs/ext-tree-checkbox"], function(){`
	`15`	`+require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){`
`16`	`16`
`17`	`17`	`var tree<?php echo $block->getId() ?>;`
`18`	`18`
`@@ -54,7 +54,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {`
`54`	`54`	`}`
`55`	`55`	`});`
`56`	`56`
`57`		`-Ext.onReady(function()`
	`57`	`+jQuery(function()`
`58`	`58`	`{`
`59`	`59`	`var emptyNodeAdded = <?php echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)`
`85`	`85`	`return $this->processRedirect($request, $rewrite);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ $request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());`
`88`	`89`	`$request->setPathInfo('/' . $rewrite->getTargetPath());`
`89`	`90`	`return $this->actionFactory->create('Magento\Framework\App\Action\Forward', ['request' => $request]);`
`90`	`91`	`}`