MAGETWO-43109: Prepare Pull Request

Michail Slabko · Michail Slabko · commit 317c90224abe · 2015-09-21T17:24:29.000+03:00
- update composer.lock
- fix tests
diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandlerTest.php b/app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandlerTest.php
@@ -51,7 +51,6 @@ protected function setUp()
             [],
             '',
             false
-
         );
         $this->ruleMock = $this->getMock('Magento\CatalogRule\Model\Rule', [], [], '', false);
 
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Attribute/Repository.php
@@ -11,7 +11,9 @@ class Repository extends \Magento\Catalog\Ui\Component\Listing\Attribute\Abstrac
     protected $request;
 
     /**
+     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Framework\App\RequestInterface $request
      */
     public function __construct(
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -131,7 +131,7 @@ require([
                         "productsProvider": "configurable_associated_product_listing.data_source",
                         "productsMassAction": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns.ids",
                         "productsColumns": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns",
-                        "productsGridUrl": "<?= $block->getUrl('catalog/product/associated_grid', ['componentJson' => true])?>",
+                        "productsGridUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/associated_grid', ['componentJson' => true])?>",
                         "configurableVariations": "configurableVariations"
                     }
                 }
diff --git a/composer.lock b/composer.lock

-Original file line number
+Diff line change
             [],
             '',
             false
+-
         );
         $this->ruleMock = $this->getMock('Magento\CatalogRule\Model\Rule', [], [], '', false);
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ require([`
`131`	`131`	`"productsProvider": "configurable_associated_product_listing.data_source",`
`132`	`132`	`"productsMassAction": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns.ids",`
`133`	`133`	`"productsColumns": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns",`
`134`		`- "productsGridUrl": "<?= $block->getUrl('catalog/product/associated_grid', ['componentJson' => true])?>",`
	`134`	`+ "productsGridUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/associated_grid', ['componentJson' => true])?>",`
`135`	`135`	`"configurableVariations": "configurableVariations"`
`136`	`136`	`}`
`137`	`137`	`}`