magento
diff --git a/‎setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
Lines changed: 20 additions & 15 deletions b/‎setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
Lines changed: 20 additions & 15 deletions
diff --git a/‎setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php
Lines changed: 36 additions & 26 deletions b/‎setup/src/Magento/Setup/Test/Unit/Console/Command/BackupCommandTest.php
Lines changed: 36 additions & 26 deletions
diff --git a/‎setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php
Lines changed: 28 additions & 21 deletions b/‎setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigSetCommandTest.php
Lines changed: 28 additions & 21 deletions
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -7,36 +7,41 @@
 
 use Magento\Setup\Console\Command\AdminUserCreateCommand;
 use Magento\Setup\Model\AdminAccount;
+use Magento\Setup\Model\Installer;
+use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 use Magento\User\Model\UserValidationRules;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AdminUserCreateCommandTest extends \PHPUnit\Framework\TestCase
+class AdminUserCreateCommandTest extends TestCase
 {
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Console\Helper\QuestionHelper
+     * @var MockObject|QuestionHelper
      */
     private $questionHelperMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Setup\Model\InstallerFactory
+     * @var MockObject|InstallerFactory
      */
     private $installerFactoryMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|AdminUserCreateCommand
+     * @var MockObject|AdminUserCreateCommand
      */
     private $command;
 
-    protected function setUp(): void
+    public function setUp(): void
     {
-        $this->installerFactoryMock = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
+        $this->installerFactoryMock = $this->createMock(InstallerFactory::class);
         $this->command = new AdminUserCreateCommand($this->installerFactoryMock, new UserValidationRules());
 
         $this->questionHelperMock = $this->getMockBuilder(QuestionHelper::class)
@@ -62,7 +67,7 @@ public function testExecute()
             InitParamListener::BOOTSTRAP_PARAM => null,
         ];
         $commandTester = new CommandTester($this->command);
-        $installerMock = $this->createMock(\Magento\Setup\Model\Installer::class);
+        $installerMock = $this->createMock(Installer::class);
         $installerMock->expects($this->once())->method('installAdminUser')->with($data);
         $this->installerFactoryMock->expects($this->once())->method('create')->willReturn($installerMock);
         $commandTester->execute($options, ['interactive' => false]);
@@ -76,28 +81,28 @@ public function testInteraction()
 
         $this->questionHelperMock->expects($this->at(0))
             ->method('ask')
-            ->willReturn('admin');
+            ->will($this->returnValue('admin'));
 
         $this->questionHelperMock->expects($this->at(1))
             ->method('ask')
-            ->willReturn('Password123');
+            ->will($this->returnValue('Password123'));
 
         $this->questionHelperMock->expects($this->at(2))
             ->method('ask')
-            ->willReturn('[email protected]');
+            ->will($this->returnValue('[email protected]'));
 
         $this->questionHelperMock->expects($this->at(3))
             ->method('ask')
-            ->willReturn('John');
+            ->will($this->returnValue('John'));
 
         $this->questionHelperMock->expects($this->at(4))
             ->method('ask')
-            ->willReturn('Doe');
+            ->will($this->returnValue('Doe'));
 
         // We override the standard helper with our mock
         $this->command->getHelperSet()->set($this->questionHelperMock, 'question');
 
-        $installerMock = $this->createMock(\Magento\Setup\Model\Installer::class);
+        $installerMock = $this->createMock(Installer::class);
 
         $expectedData = [
             'admin-user' => 'admin',
@@ -167,7 +172,7 @@ public function getOptionListDataProvider()
     public function testValidate(array $options, array $errors)
     {
         $inputMock = $this->getMockForAbstractClass(
-            \Symfony\Component\Console\Input\InputInterface::class,
+            InputInterface::class,
             [],
             '',
             false
 
@@ -1,23 +1,33 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Setup\Test\Unit\Console\Command;
 
 use Magento\Framework\App\Console\MaintenanceModeEnabler;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\State;
+use Magento\Framework\ObjectManager\ConfigLoaderInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\BackupRollback;
+use Magento\Framework\Setup\BackupRollbackFactory;
 use Magento\Setup\Console\Command\BackupCommand;
+use Magento\Setup\Model\ObjectManagerProvider;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class BackupCommandTest extends \PHPUnit\Framework\TestCase
+class BackupCommandTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var ObjectManagerInterface|MockObject
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\Setup\BackupRollback|\PHPUnit\Framework\MockObject\MockObject
+     * @var BackupRollback|MockObject
      */
     private $backupRollback;
 
@@ -27,35 +37,35 @@ class BackupCommandTest extends \PHPUnit\Framework\TestCase
     private $tester;
 
     /**
-     * @var \Magento\Framework\Setup\BackupRollbackFactory|\PHPUnit\Framework\MockObject\MockObject
+     * @var BackupRollbackFactory|MockObject
      */
     private $backupRollbackFactory;
 
     /**
-     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit\Framework\MockObject\MockObject
+     * @var DeploymentConfig|MockObject
      */
     private $deploymentConfig;
 
-    protected function setUp(): void
+    public function setUp(): void
     {
-        $maintenanceMode = $this->createMock(\Magento\Framework\App\MaintenanceMode::class);
-        $objectManagerProvider = $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
+        $maintenanceMode = $this->createMock(MaintenanceMode::class);
+        $objectManagerProvider = $this->createMock(ObjectManagerProvider::class);
         $this->objectManager = $this->getMockForAbstractClass(
-            \Magento\Framework\ObjectManagerInterface::class,
+            ObjectManagerInterface::class,
             [],
             '',
             false
         );
         $objectManagerProvider->expects($this->any())->method('get')->willReturn($this->objectManager);
-        $this->backupRollback = $this->createMock(\Magento\Framework\Setup\BackupRollback::class);
-        $this->backupRollbackFactory = $this->createMock(\Magento\Framework\Setup\BackupRollbackFactory::class);
+        $this->backupRollback = $this->createMock(BackupRollback::class);
+        $this->backupRollbackFactory = $this->createMock(BackupRollbackFactory::class);
         $this->backupRollbackFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->backupRollback);
-        $this->deploymentConfig = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $appState = $this->createMock(\Magento\Framework\App\State::class);
+        $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
+        $appState = $this->createMock(State::class);
         $configLoader = $this->getMockForAbstractClass(
-            \Magento\Framework\ObjectManager\ConfigLoaderInterface::class,
+            ConfigLoaderInterface::class,
             [],
             '',
             false
@@ -64,12 +74,12 @@ protected function setUp(): void
 
         $this->objectManager->expects($this->any())
             ->method('get')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Setup\BackupRollbackFactory::class, $this->backupRollbackFactory],
-                    [\Magento\Framework\App\State::class, $appState],
-                    [\Magento\Framework\ObjectManager\ConfigLoaderInterface::class, $configLoader],
-                ]
+            ->will(
+                $this->returnValueMap([
+                    [BackupRollbackFactory::class, $this->backupRollbackFactory],
+                    [State::class, $appState],
+                    [ConfigLoaderInterface::class, $configLoader],
+                ])
             );
         $command = new BackupCommand(
             $objectManagerProvider,
@@ -84,7 +94,7 @@ public function testExecuteCodeBackup()
     {
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
         $this->backupRollback->expects($this->once())
             ->method('codeBackup')
             ->willReturn($this->backupRollback);
@@ -95,7 +105,7 @@ public function testExecuteMediaBackup()
     {
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
         $this->backupRollback->expects($this->once())
             ->method('codeBackup')
             ->willReturn($this->backupRollback);
@@ -106,7 +116,7 @@ public function testExecuteDBBackup()
     {
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
         $this->backupRollback->expects($this->once())
             ->method('dbBackup')
             ->willReturn($this->backupRollback);
@@ -117,7 +127,7 @@ public function testExecuteNotInstalled()
     {
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
-            ->willReturn(false);
+            ->will($this->returnValue(false));
         $this->tester->execute(['--db' => true]);
         $this->assertStringMatchesFormat(
             'No information is available: the Magento application is not installed.%w',
@@ -129,7 +139,7 @@ public function testExecuteNoOptions()
     {
         $this->deploymentConfig->expects($this->once())
             ->method('isAvailable')
-            ->willReturn(false);
+            ->will($this->returnValue(false));
         $this->tester->execute([]);
         $expected = 'Enabling maintenance mode' . PHP_EOL
             . 'Not enough information provided to take backup.' . PHP_EOL
 
@@ -1,46 +1,53 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Setup\Test\Unit\Console\Command;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Module\ModuleList;
+use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Setup\Console\Command\ConfigSetCommand;
+use Magento\Setup\Model\ConfigModel;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class ConfigSetCommandTest extends \PHPUnit\Framework\TestCase
+class ConfigSetCommandTest extends TestCase
 {
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Setup\Model\ConfigModel
+     * @var MockObject|ConfigModel
      */
     private $configModel;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\App\DeploymentConfig
+     * @var MockObject|DeploymentConfig
      */
     private $deploymentConfig;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Setup\Console\Command\ConfigSetCommand
+     * @var MockObject|ConfigSetCommand
      */
     private $command;
 
-    protected function setUp(): void
+    public function setUp(): void
     {
-        $option = $this->createMock(\Magento\Framework\Setup\Option\TextConfigOption::class);
+        $option = $this->createMock(TextConfigOption::class);
         $option
             ->expects($this->any())
             ->method('getName')
-            ->willReturn('db-host');
-        $this->configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
+            ->will($this->returnValue('db-host'));
+        $this->configModel = $this->createMock(ConfigModel::class);
         $this->configModel
             ->expects($this->exactly(2))
             ->method('getAvailableOptions')
-            ->willReturn([$option]);
-        $moduleList = $this->createMock(\Magento\Framework\Module\ModuleList::class);
-        $this->deploymentConfig = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+            ->will($this->returnValue([$option]));
+        $moduleList = $this->createMock(ModuleList::class);
+        $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
         $this->command = new ConfigSetCommand($this->configModel, $moduleList, $this->deploymentConfig);
     }
 
@@ -49,7 +56,7 @@ public function testExecuteNoInteractive()
         $this->deploymentConfig
             ->expects($this->once())
             ->method('get')
-            ->willReturn(null);
+            ->will($this->returnValue(null));
         $this->configModel
             ->expects($this->once())
             ->method('process')
@@ -67,7 +74,7 @@ public function testExecuteInteractiveWithYes()
         $this->deploymentConfig
             ->expects($this->once())
             ->method('get')
-            ->willReturn('localhost');
+            ->will($this->returnValue('localhost'));
         $this->configModel
             ->expects($this->once())
             ->method('process')
@@ -80,7 +87,7 @@ public function testExecuteInteractiveWithNo()
         $this->deploymentConfig
             ->expects($this->once())
             ->method('get')
-            ->willReturn('localhost');
+            ->will($this->returnValue('localhost'));
         $this->configModel
             ->expects($this->once())
             ->method('process')
@@ -96,27 +103,27 @@ public function testExecuteInteractiveWithNo()
      */
     private function checkInteraction($interactionType)
     {
-        $dialog = $this->createMock(\Symfony\Component\Console\Helper\QuestionHelper::class);
+        $dialog = $this->createMock(QuestionHelper::class);
         $dialog
             ->expects($this->once())
             ->method('ask')
-            ->willReturn($interactionType);
+            ->will($this->returnValue($interactionType));
 
-        /** @var \Symfony\Component\Console\Helper\HelperSet|\PHPUnit\Framework\MockObject\MockObject $helperSet */
-        $helperSet = $this->createMock(\Symfony\Component\Console\Helper\HelperSet::class);
+        /** @var HelperSet|MockObject $helperSet */
+        $helperSet = $this->createMock(HelperSet::class);
         $helperSet
             ->expects($this->once())
             ->method('get')
             ->with('question')
-            ->willReturn($dialog);
+            ->will($this->returnValue($dialog));
         $this->command->setHelperSet($helperSet);
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute(['--db-host' => 'host']);
         if (strtolower($interactionType) === 'y') {
             $message = 'You saved the new configuration.' . PHP_EOL;
         } else {
-            $message = 'You made no changes to the configuration.'.PHP_EOL;
+            $message = 'You made no changes to the configuration.' . PHP_EOL;
         }
         $this->assertSame(
             $message,