Use injection via optional constructor param

Author: kristof-ringleff

lib/internal/Magento/Framework/App/Cron.php

@@ -56,13 +56,15 @@ public function __construct(
         Console\Request $request,
         Console\Response $response,
         ObjectManagerInterface $objectManager,
-        array $parameters = []
+        array $parameters = [],
+        \Magento\Framework\App\AreaList $arealist = null
     ) {
         $this->_state = $state;
         $this->_request = $request;
         $this->_request->setParams($parameters);
         $this->_response = $response;
         $this->objectManager = $objectManager;
+        $this->arealist = $arealist ?: $this->objectManager->get(\Magento\Framework\App\AreaList::class);
     }
 
     /**
@@ -76,8 +78,7 @@ public function launch()
         $configLoader = $this->objectManager->get(\Magento\Framework\ObjectManager\ConfigLoaderInterface::class);
         $this->objectManager->configure($configLoader->load(Area::AREA_CRONTAB));
 
-        $areaList = $this->getAreaList();
-        $areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
+        $this->areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
 
         /** @var \Magento\Framework\Event\ManagerInterface $eventManager */
         $eventManager = $this->objectManager->get(\Magento\Framework\Event\ManagerInterface::class);
@@ -86,19 +87,6 @@ public function launch()
         return $this->_response;
     }
 
-    /**
-     * @deprecated
-     *
-     * @return \Magento\Framework\App\AreaList
-     */
-    private function getAreaList()
-    {
-        if ($this->areaList === null) {
-            $this->areaList = $this->objectManager->get(\Magento\Framework\App\AreaList::class);
-        }
-        return $this->areaList;
-    }
-
     /**
      * {@inheritdoc}
      */

lib/internal/Magento/Framework/App/Test/Unit/CronTest.php

@@ -46,14 +46,18 @@ protected function setUp()
         $this->_request = $this->getMock(\Magento\Framework\App\Console\Request::class, [], [], '', false);
         $this->_responseMock = $this->getMock(\Magento\Framework\App\Console\Response::class, [], [], '', false);
         $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
-        $this->_model = new Cron($this->_stateMock, $this->_request, $this->_responseMock, $this->objectManager);
+        $this->_model = new Cron(
+            $this->_stateMock,
+            $this->_request,
+            $this->_responseMock,
+            $this->objectManager,
+            [],
+            $this->prepareAreaListMock()
+        );
     }
 
-    public function testLaunchDispatchesCronEvent()
+    protected function prepareAreaListMock()
     {
-        $configLoader = $this->getMockForAbstractClass(\Magento\Framework\ObjectManager\ConfigLoaderInterface::class);
-        $eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
-
         $areaMock = $this->getMock(\Magento\Framework\App\Area::class, [], [], '', false);
         $areaMock->expects($this->once())
             ->method('load')
@@ -65,12 +69,19 @@ public function testLaunchDispatchesCronEvent()
             ->with(Area::AREA_CRONTAB)
             ->willReturn($areaMock);
 
+        return $areaListMock;
+    }
+
+    public function testLaunchDispatchesCronEvent()
+    {
+        $configLoader = $this->getMockForAbstractClass(\Magento\Framework\ObjectManager\ConfigLoaderInterface::class);
+        $eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
+
         $this->objectManager->expects($this->any())
             ->method('get')
             ->will($this->returnValueMap([
                 [\Magento\Framework\ObjectManager\ConfigLoaderInterface::class, $configLoader],
-                [\Magento\Framework\Event\ManagerInterface::class, $eventManagerMock],
-                [\Magento\Framework\App\AreaList::class, $areaListMock]
+                [\Magento\Framework\Event\ManagerInterface::class, $eventManagerMock]
             ]));
         $crontabConfig = ['config'];
         $configLoader->expects($this->once())