[Backport] Fix $useCache for container child blocks

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
 
+    /**
+     * @return array
+     */
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->getMock('stdClass', ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->getMock('stdClass', ['getCacheType']);

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -69,6 +69,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -79,6 +79,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
         $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

@@ -198,6 +198,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
         $this->tierPrice->isValid($value);
     }
 
+    /**
+     * @return array
+     */
     public function isValidResultFalseDataProvider()
     {
         return [
@@ -303,6 +306,9 @@ public function isValidResultFalseDataProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function isValidAddMessagesCallDataProvider()
     {
         return [

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -127,6 +127,9 @@ public function testGetAllWebsitesValue()
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array
+     */
     public function isValidReturnDataProvider()
     {
         return [

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php

@@ -76,6 +76,9 @@ public function testInit()
         $this->validator->init(null);
     }
 
+    /**
+     * @return array
+     */
     public function isValidDataProvider()
     {
         return [

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -751,6 +751,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
         $this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
     }
 
+    /**
+     * @return array
+     */
     public function saveProductPricesDataProvider()
     {
         return [
@@ -822,6 +825,9 @@ public function testDeleteProductTierPrices(
         );
     }
 
+    /**
+     * @return array
+     */
     public function deleteProductTierPricesDataProvider()
     {
         return [
@@ -904,6 +910,9 @@ public function testProcessCountExistingPrices(
         $this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
     }
 
+    /**
+     * @return array
+     */
     public function processCountExistingPricesDataProvider()
     {
         return [

app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php

@@ -75,6 +75,9 @@ public function testGetAllowedResourcesByUser()
         );
     }
 
+    /**
+     * @return AclRetriever
+     */
     protected function createAclRetriever()
     {
         $this->roleMock = $this->getMock(

app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php

@@ -37,6 +37,9 @@ public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amou
         );
     }
 
+    /**
+     * @return array
+     */
     public function generateHashDataProvider()
     {
         return [
@@ -57,6 +60,13 @@ public function generateHashDataProvider()
         ];
     }
 
+    /**
+     * @param $merchantMd5
+     * @param $merchantApiLogin
+     * @param $amount
+     * @param $transactionId
+     * @return string
+     */
     protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));

app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php

@@ -19,6 +19,10 @@ class BackendModel extends Value
     /** Minimum admin session lifetime */
     const MIN_LIFETIME = 60;
 
+    /**
+     * @return Value
+     * @throws LocalizedException
+     */
     public function beforeSave()
     {
         $value = (int) $this->getValue();

app/code/Magento/Backend/Model/View/Layout/Reader/Block.php

@@ -13,6 +13,14 @@
  */
 class Block extends Layout\Reader\Block
 {
+    /**
+     * Block constructor.
+     * @param Layout\ScheduledStructure\Helper $helper
+     * @param Layout\Argument\Parser $argumentParser
+     * @param Layout\ReaderPool $readerPool
+     * @param InterpreterInterface $argumentInterpreter
+     * @param null $scopeType
+     */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
         Layout\Argument\Parser $argumentParser,

app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php

@@ -149,6 +149,9 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw
         $this->assertEquals($expectedResult, $this->plugin->aroundDispatch($subject, $proceed, $request));
     }
 
+    /**
+     * @return array
+     */
     public function processNotLoggedInUserDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php

@@ -75,6 +75,9 @@ public function testAroundDispatchWhenMassactionPrepareKeyRequestExists($postDat
         );
     }
 
+    /**
+     * @return array
+     */
     public function aroundDispatchDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php

@@ -8,6 +8,9 @@
 
 class ActionStub extends \Magento\Backend\App\Action
 {
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
+     */
     public function execute()
     {
         // Empty method stub for test

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -118,6 +118,9 @@ public function testIsHostBackend($url, $host, $useCustomAdminUrl, $customAdminU
         $this->assertEquals($this->model->isHostBackend(), $expectedValue);
     }
 
+    /**
+     * @return array
+     */
     public function hostsDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/App/ConfigTest.php

@@ -79,6 +79,9 @@ public function testIsSetFlag($configPath, $configValue, $expectedResult)
         $this->assertEquals($expectedResult, $this->model->isSetFlag($configPath));
     }
 
+    /**
+     * @return array
+     */
     public function isSetFlagDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php

@@ -88,6 +88,9 @@ public function testIsInProductionMode($mode, $expected)
         $this->assertEquals($expected, $this->additonalBlock->isInProductionMode());
     }
 
+    /**
+     * @return array
+     */
     public function isInProductionModeDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php

@@ -61,6 +61,9 @@ public function testGetAttributesHtml($data, $expect)
         $this->assertRegExp($expect, $attributes);
     }
 
+    /**
+     * @return array
+     */
     public function getAttributesHtmlDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/Radio/ExtendedTest.php

@@ -60,6 +60,9 @@ public function testRender(array $rowData, $expectedResult)
         $this->assertEquals($expectedResult, $this->_object->render(new \Magento\Framework\DataObject($rowData)));
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/RadioTest.php

@@ -69,6 +69,9 @@ public function testRender(array $rowData, $expectedResult)
         $this->assertEquals($expectedResult, $this->_object->render(new \Magento\Framework\DataObject($rowData)));
     }
 
+    /**
+     * @return array
+     */
     public function renderDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php

@@ -91,6 +91,9 @@ public function testGetSortable($value)
         $this->assertFalse($this->_block->getSortable());
     }
 
+    /**
+     * @return array
+     */
     public function getSortableDataProvider()
     {
         return ['zero' => ['0'], 'false' => [false], 'null' => [null]];
@@ -379,6 +382,9 @@ public function testColumnIsGrouped($groupedData, $expected)
         $this->assertEquals($expected, $block->isGrouped());
     }
 
+    /**
+     * @return array
+     */
     public function columnGroupedDataProvider()
     {
         return [[[], false], [['grouped' => 0], false], [['grouped' => 1], true]];

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php

@@ -155,6 +155,9 @@ public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
         $this->assertEquals($result, $this->_block->getGridIdsJson());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetGridIdsJsonWithUseSelectAll()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php

@@ -154,6 +154,9 @@ public function testItemsProcessing($itemId, $item, $expectedItem)
         $this->assertNull($this->_block->getItem($itemId));
     }
 
+    /**
+     * @return array
+     */
     public function itemsDataProvider()
     {
         return [
@@ -204,6 +207,9 @@ public function testSelected($param, $expectedJson, $expected)
         $this->assertEquals($expected, $this->_block->getSelected());
     }
 
+    /**
+     * @return array
+     */
     public function selectedDataProvider()
     {
         return [
@@ -259,6 +265,9 @@ public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
         $this->assertEquals($result, $this->_block->getGridIdsJson());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderGetGridIdsJsonWithUseSelectAll()
     {
         return [

app/code/Magento/Backend/Test/Unit/Block/Widget/TabTest.php

@@ -34,6 +34,9 @@ public function testGetters($method, $field, $value, $expected)
         $this->assertEquals($expected, $object->{$method}());
     }
 
+    /**
+     * @return array
+     */
     public function dataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Helper/DataTest.php

@@ -66,6 +66,9 @@ public function testPrepareFilterStringValues(array $inputString, array $expecte
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @return array
+     */
     public function getPrepareFilterStringValuesDataProvider()
     {
         return [

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

@@ -130,6 +130,9 @@ public function testRefreshAcl($isUserPassedViaParams)
         $this->assertSame($aclMock, $this->session->getAcl());
     }
 
+    /**
+     * @return array
+     */
     public function refreshAclDataProvider()
     {
         return [
@@ -235,6 +238,9 @@ public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expect
         $this->assertEquals($expectedResult, $this->session->isAllowed('resource'));
     }
 
+    /**
+     * @return array
+     */
     public function isAllowedDataProvider()
     {
         return [
@@ -255,6 +261,9 @@ public function testFirstPageAfterLogin($isFirstPageAfterLogin)
         $this->assertEquals($isFirstPageAfterLogin, $this->session->isFirstPageAfterLogin());
     }
 
+    /**
+     * @return array
+     */
     public function firstPageAfterLoginDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php

@@ -24,6 +24,9 @@ public function testBeforeSave($value, $errorMessage = null)
         $model->beforeSave();
     }
 
+    /**
+     * @return array
+     */
     public function adminSessionLifetimeDataProvider()
     {
         return [

app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php

@@ -194,6 +194,9 @@ public function testGetMenuExceptionLogged($expectedException)
         $this->_model->getMenu();
     }
 
+    /**
+     * @return array
+     */
     public function getMenuExceptionLoggedDataProvider()
     {
         return [