Merge remote-tracking branch 'origin/MC-22829' into 2.3-develop-pr90

Author: zakdma

app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php

@@ -18,38 +18,41 @@ class SessionTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Backend\App\Config | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $config;
+    private $config;
 
     /**
      * @var \Magento\Framework\Session\Config | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $sessionConfig;
+    private $sessionConfig;
 
     /**
      * @var \Magento\Framework\Stdlib\CookieManagerInterface | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $cookieManager;
+    private $cookieManager;
 
     /**
      * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $cookieMetadataFactory;
+    private $cookieMetadataFactory;
 
     /**
      * @var \Magento\Framework\Session\Storage | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storage;
+    private $storage;
 
     /**
      * @var \Magento\Framework\Acl\Builder | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $aclBuilder;
+    private $aclBuilder;
 
     /**
      * @var Session
      */
-    protected $session;
+    private $session;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->cookieMetadataFactory = $this->createPartialMock(

app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php

@@ -10,13 +10,16 @@ class RoleLocatorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Backend\Model\Authorization\RoleLocator
      */
-    protected $_model;
+    private $_model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_sessionMock = [];
+    private $_sessionMock = [];
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->_sessionMock = $this->createPartialMock(

app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

@@ -12,28 +12,31 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Backend\Model\Locale\Manager
      */
-    protected $_model;
+    private $_model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
      */
-    protected $_translator;
+    private $_translator;
 
     /**
      * @var \Magento\Backend\Model\Session
      */
-    protected $_session;
+    private $_session;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
-    protected $_authSession;
+    private $_authSession;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
      */
-    protected $_backendConfig;
+    private $_backendConfig;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->_session = $this->createMock(\Magento\Backend\Model\Session::class);

app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php

@@ -11,28 +11,31 @@ class GroupTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Group
      */
-    protected $_model;
+    private $_model;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\AbstractElement
      */
-    protected $_element;
+    private $_element;
 
     /**
      * @var \Magento\Backend\Model\Auth\Session|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_authSession;
+    private $_authSession;
 
     /**
      * @var \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_user;
+    private $_user;
 
     /**
      * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_group;
+    private $_group;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);