Skip to content

Commit 215698b

Browse files
committed
MAGETWO-54205: After Disable/Enable Magento modules via CLI all cache types become disabled
- reverting changes to uninstall command files. The regenerate flag will be created as part of magento-composer-installer
1 parent f2d9176 commit 215698b

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

setup/src/Magento/Setup/Console/Command/UninstallCommand.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Symfony\Component\Console\Question\ConfirmationQuestion;
1212
use Magento\Setup\Model\InstallerFactory;
1313
use Magento\Framework\Setup\ConsoleLogger;
14-
use Magento\Framework\Code\GeneratedFiles;
1514

1615
class UninstallCommand extends AbstractSetupCommand
1716
{
@@ -20,18 +19,12 @@ class UninstallCommand extends AbstractSetupCommand
2019
*/
2120
private $installerFactory;
2221

23-
/**
24-
* @var GeneratedFiles
25-
*/
26-
private $generatedFiles;
27-
2822
/**
2923
* @param InstallerFactory $installerFactory
3024
*/
31-
public function __construct(InstallerFactory $installerFactory, GeneratedFiles $generatedFiles)
25+
public function __construct(InstallerFactory $installerFactory)
3226
{
3327
$this->installerFactory = $installerFactory;
34-
$this->generatedFiles = $generatedFiles;
3528
parent::__construct();
3629
}
3730

@@ -56,7 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
5649
if ($helper->ask($input, $output, $question) || !$input->isInteractive()) {
5750
$installer = $this->installerFactory->create(new ConsoleLogger($output));
5851
$installer->uninstall();
59-
$this->generatedFiles->requestRegeneration();
6052
}
6153
}
6254
}

setup/src/Magento/Setup/Test/Unit/Console/Command/UninstallCommandTest.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Magento\Setup\Console\Command\UninstallCommand;
1111
use Symfony\Component\Console\Tester\CommandTester;
1212
use Magento\Setup\Model\Installer;
13-
use Magento\Framework\Code\GeneratedFiles;
1413

1514
class UninstallCommandTest extends \PHPUnit_Framework_TestCase
1615
{
@@ -19,11 +18,6 @@ class UninstallCommandTest extends \PHPUnit_Framework_TestCase
1918
*/
2019
private $installerFactory;
2120

22-
/**
23-
* @var GeneratedFiles|\PHPUnit_Framework_MockObject_MockObject
24-
*/
25-
private $generatedFiles;
26-
2721
/**
2822
* @var Installer|\PHPUnit_Framework_MockObject_MockObject
2923
*/
@@ -37,9 +31,8 @@ class UninstallCommandTest extends \PHPUnit_Framework_TestCase
3731
public function setUp()
3832
{
3933
$this->installerFactory = $this->getMock('Magento\Setup\Model\InstallerFactory', [], [], '', false);
40-
$this->generatedFiles = $this->getMock('Magento\Framework\Code\GeneratedFiles', [], [], '', false);
4134
$this->installer = $this->getMock('Magento\Setup\Model\Installer', [], [], '', false);
42-
$this->command = new UninstallCommand($this->installerFactory, $this->generatedFiles);
35+
$this->command = new UninstallCommand($this->installerFactory);
4336
}
4437

4538
public function testExecuteInteractionYes()

0 commit comments

Comments
 (0)