#13716

Author: Stanislav Idolov

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php

@@ -11,11 +11,11 @@ class UrlRewriteTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_model;
+    private $model;
 
     protected function setUp()
     {
-        $this->_model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
+        $this->model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
             ->disableOriginalConstructor()
             ->setMethodsExcept(['joinUrlRewrite', 'setStoreId', 'getStoreId'])
             ->getMock();
@@ -24,7 +24,7 @@ protected function setUp()
     public function testStoreIdUsedByUrlRewrite()
     {
         $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\'';
-        $this->_model->expects($this->once())
+        $this->model->expects($this->once())
             ->method('joinTable')
             ->with(
                 $this->anything(),
@@ -33,7 +33,7 @@ public function testStoreIdUsedByUrlRewrite()
                 $this->equalTo($cond),
                 $this->anything()
             );
-        $this->_model->setStoreId(100);
-        $this->_model->joinUrlRewrite();
+        $this->model->setStoreId(100);
+        $this->model->joinUrlRewrite();
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php

@@ -10,7 +10,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
      */
-    protected $collection;
+    private $collection;
 
     /**
      * Sets up the fixture, for example, opens a network connection.

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 /** @var \Magento\Catalog\Model\CategoryFactory $factory */
 $factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\CategoryFactory::class
@@ -20,6 +25,7 @@
     $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()->getDefaultGroupId();
+
     $store->setCode(
         'second_category_store'
     )->setWebsiteId(
@@ -55,7 +61,6 @@
 $repository->save($newCategory);
 $currentStoreId = $storeManager->getStore()->getId();
 $storeManager->setCurrentStore($storeManager->getStore($store->getId()));
-$newCategory
-    ->setUrlKey('category-3-on-2');
+$newCategory->setUrlKey('category-3-on-2');
 $repository->save($newCategory);
 $storeManager->setCurrentStore($storeManager->getStore($currentStoreId));