Skip to content

Commit 21f8a0a

Browse files
committed
Remove unused code
1 parent 3d31834 commit 21f8a0a

File tree

2 files changed

+3
-50
lines changed

2 files changed

+3
-50
lines changed

app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Magento\SampleData\Console\Command;
88

9-
use Composer\Console\Application;
109
use Composer\Console\ApplicationFactory;
1110
use Exception;
1211
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -15,12 +14,10 @@
1514
use Magento\Framework\Exception\InvalidArgumentException;
1615
use Magento\Framework\Exception\LocalizedException;
1716
use Magento\Framework\Filesystem;
18-
use Magento\Framework\Serialize\Serializer\Json;
1917
use Magento\SampleData\Model\Dependency;
2018
use Magento\Setup\Model\PackagesAuth;
2119
use Symfony\Component\Console\Command\Command;
2220
use Symfony\Component\Console\Input\ArrayInput;
23-
use Symfony\Component\Console\Input\ArrayInputFactory;
2421
use Symfony\Component\Console\Input\InputInterface;
2522
use Symfony\Component\Console\Input\InputOption;
2623
use Symfony\Component\Console\Output\OutputInterface;
@@ -40,37 +37,23 @@ class SampleDataDeployCommand extends Command
4037
/** @var Dependency */
4138
private Dependency $sampleDataDependency;
4239

43-
/**
44-
* @var ArrayInputFactory
45-
* @deprecated 100.1.0
46-
*/
47-
private ArrayInputFactory $arrayInputFactory;
48-
4940
/** @var ApplicationFactory */
5041
private ApplicationFactory $applicationFactory;
5142

52-
/** @var Json */
53-
private Json $serializer;
54-
5543
/**
5644
* @param Filesystem $filesystem
5745
* @param Dependency $sampleDataDependency
58-
* @param ArrayInputFactory $arrayInputFactory
5946
* @param ApplicationFactory $applicationFactory
60-
* @param Json $serializer
6147
*/
6248
public function __construct(
6349
Filesystem $filesystem,
6450
Dependency $sampleDataDependency,
65-
ArrayInputFactory $arrayInputFactory,
66-
ApplicationFactory $applicationFactory,
67-
Json $serializer
51+
ApplicationFactory $applicationFactory
6852
) {
6953
$this->filesystem = $filesystem;
7054
$this->sampleDataDependency = $sampleDataDependency;
71-
$this->arrayInputFactory = $arrayInputFactory;
7255
$this->applicationFactory = $applicationFactory;
73-
$this->serializer = $serializer;
56+
7457
parent::__construct();
7558
}
7659

@@ -118,7 +101,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
118101
$arguments = array_merge(['command' => 'require'], $commonArgs);
119102
$commandInput = new ArrayInput($arguments);
120103

121-
/** @var Application $application */
122104
$application = $this->applicationFactory->create();
123105
$application->setAutoExit(false);
124106
$result = $application->run($commandInput, $output);

app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,12 @@
99

1010
use Exception;
1111
use Magento\Framework\App\Filesystem\DirectoryList;
12-
use Magento\Framework\Serialize\Serializer\Json;
1312
use Magento\SampleData\Console\Command\SampleDataDeployCommand;
1413
use Magento\Setup\Model\PackagesAuth;
15-
use PHPUnit\Framework\MockObject\MockObject;
1614
use Symfony\Component\Console\Tester\CommandTester;
1715

1816
class SampleDataDeployCommandTest extends AbstractSampleDataCommandTest
1917
{
20-
/**
21-
* @var Json|MockObject
22-
*/
23-
private $serializerMock;
24-
25-
protected function setUp(): void
26-
{
27-
parent::setUp();
28-
$this->serializerMock = $this->createMock(Json::class);
29-
}
30-
31-
/**
32-
* Sets mock for unserialization composer content
33-
* @param array $composerJsonContent
34-
* @return void
35-
*/
36-
protected function setupMockForSerializer(array $composerJsonContent): void
37-
{
38-
$this->serializerMock->expects($this->any())
39-
->method('unserialize')
40-
->will($this->returnValue($composerJsonContent));
41-
}
42-
4318
/**
4419
* Sets mocks for auth file
4520
*
@@ -85,7 +60,6 @@ public function testExecute(
8560
$composerJsonContent
8661
);
8762
$this->setupMocksForAuthFile($authExist);
88-
$this->setupMockForSerializer($composerJsonContent);
8963
$commandTester = $this->createCommandTester();
9064
$commandTester->execute([]);
9165

@@ -117,7 +91,6 @@ public function testExecuteWithNoUpdate(
11791
['--no-update' => 1]
11892
);
11993
$this->setupMocksForAuthFile($authExist);
120-
$this->setupMockForSerializer($composerJsonContent);
12194
$commandInput = ['--no-update' => 1];
12295

12396
$commandTester = $this->createCommandTester();
@@ -210,9 +183,7 @@ private function createCommandTester(): CommandTester
210183
new SampleDataDeployCommand(
211184
$this->filesystemMock,
212185
$this->sampleDataDependencyMock,
213-
$this->arrayInputFactoryMock,
214-
$this->applicationFactoryMock,
215-
$this->serializerMock
186+
$this->applicationFactoryMock
216187
)
217188
);
218189
}

0 commit comments

Comments
 (0)