resolve conflict

Author: engcom-Echo

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

@@ -76,11 +76,6 @@ abstract class AbstractSampleDataCommandTest extends TestCase
      */
     private $appRunResult;
 
-    /**
-     * Creates mocks
-     *
-     * @return void
-     */
     protected function setUp(): void
     {
         $this->directoryReadMock = $this->getMockForAbstractClass(ReadInterface::class);
@@ -93,8 +88,6 @@ protected function setUp(): void
     }
 
     /**
-     * Sets mocks
-     *
      * @param array $sampleDataPackages Array in form [package_name => version_constraint]
      * @param string $pathToComposerJson Fake path to composer.json
      * @param int $appRunResult Composer exit code
@@ -190,5 +183,5 @@ protected function setupMocks(
     abstract protected function expectedComposerArgumentsSampleDataCommands(
         array $sampleDataPackages,
         string $pathToComposerJson
-    ) : array;
+    ): array;
 }

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

@@ -22,15 +22,9 @@ class SampleDataDeployCommandTest extends AbstractSampleDataCommandTest
      */
     private $serializerMock;
 
-    /**
-     * Creates mocks
-     *
-     * @return void
-     */
     protected function setUp(): void
     {
         parent::setUp();
-
         $this->serializerMock = $this->createMock(Json::class);
     }