Resolve issues identified by PHPStorm

Author: fredden

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

@@ -121,11 +121,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             );
 
             return Cli::RETURN_SUCCESS;
-        } else {
-            $output->writeln('<info>' . 'There is no sample data for current set of modules.' . '</info>');
-
-            return Cli::RETURN_FAILURE;
         }
+
+        $output->writeln('<info>' . 'There is no sample data for current set of modules.' . '</info>');
+
+        return Cli::RETURN_FAILURE;
     }
 
     /**

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

@@ -149,7 +149,7 @@ public function processDataProvider(): array
      */
     public function testExecuteWithException(): void
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage(
             'Error in writing Auth file path/to/auth.json. Please check permissions for writing.'
         );
@@ -189,8 +189,8 @@ private function createCommandTester(): CommandTester
     }
 
     /**
-     * @param $sampleDataPackages
-     * @param $pathToComposerJson
+     * @param array $sampleDataPackages
+     * @param string $pathToComposerJson
      * @return array
      */
     protected function expectedComposerArgumentsSampleDataCommands(
@@ -211,7 +211,7 @@ protected function expectedComposerArgumentsSampleDataCommands(
      */
     private function packageVersionStrings(array $sampleDataPackages): array
     {
-        array_walk($sampleDataPackages, function (&$v, $k) {
+        array_walk($sampleDataPackages, static function (&$v, $k) {
             $v = "$k:$v";
         });