Merge branch 'MAGETWO-58796' into BUGS

Author: Oleksandr Osadchyi

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -35,7 +35,7 @@ class Topmenu extends Template implements IdentityInterface
      *
      * @var Registry
      *
-     * @deprecated
+     * @deprecated The property can be removed in a future major release.
      */
     protected $registry;
 

app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php

@@ -202,6 +202,10 @@ public function testGetCacheKeyInfo()
     }
 
     /**
+     * Create Tree Node mock object
+     *
+     * Helper method, that provides unified logic of creation of Tree Node mock objects.
+     *
      * @param bool $isCurrentItem
      * @return \PHPUnit_Framework_MockObject_MockObject
      */

app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/IndexTest.php

@@ -18,7 +18,9 @@ public function testIndexAction()
         $menuModel = $this->getMock(
             \Magento\Backend\Model\Menu::class,
             [],
-            [$this->getMock(\Psr\Log\LoggerInterface::class)]
+            [$this->getMock(\Psr\Log\LoggerInterface::class)],
+            '',
+            false
         );
         $menuModel->expects($this->once())
             ->method('getParentItems')