phpstan fixes

chamilo · Dec 16, 2019 · 0ff31bf · 0ff31bf
1 parent 4a20ad8
commit 0ff31bf
Show file tree

Hide file tree

Showing 51 changed files with 148 additions and 218 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,12 +1,4 @@
 parameters:
 	excludes_analyse:
-		- %rootDir%/../../../public/main/admin/db.php
-		- %rootDir%/../../../public/main/extra/*
-		- %rootDir%/../../../public/main/cron/*
-		- %rootDir%/../../../public/main/inc/lib/pear/*
-		- %rootDir%/../../../public/main/inc/lib/nusoap/*
-		- %rootDir%/../../../public/main/inc/lib/search/*
-		- %rootDir%/../../../public/main/webservices/*
-		- %rootDir%/../../../src/CoreBundle/Migrations/Schema/*
 		- %rootDir%/../../../tests/*
 	level: max
diff --git a/src/Command/Common/ChamiloEmailCommand.php b/src/Command/Common/ChamiloEmailCommand.php
@@ -24,11 +24,13 @@ protected function configure(): void
     }
 
     /**
-     * @return int|void|null
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $configuration = $input->getOption('conf');
         $this->getHelper('configuration')->readConfigurationFile($configuration);
+
+        return 0;
     }
 }
diff --git a/src/Command/Common/ChamiloUserCommand.php b/src/Command/Common/ChamiloUserCommand.php
@@ -2,21 +2,6 @@
 
 namespace Chash\Command\Common;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
 class ChamiloUserCommand extends DatabaseCommand
 {
-    protected function configure(): void
-    {
-        parent::configure();
-    }
-
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        parent::execute($input, $output);
-    }
 }
diff --git a/src/Command/Common/CommonCommand.php b/src/Command/Common/CommonCommand.php
@@ -151,9 +151,9 @@ public function getRootSys()
     }
 
     /**
-     * @return string
+     * @return null|string
      */
-    public function getCourseSysPath()
+    public function getCourseSysPath(): ?string
     {
         if (is_dir($this->getRootSys().'courses')) {
             return $this->getRootSys().'courses';
@@ -636,7 +636,7 @@ public function setRootSysDependingConfigurationPath($path)
      * @param string $path
      * @param object $output  Output handler to print info messages
      *
-     * @return bool
+     * @return bool|int
      */
     public function writeConfiguration($version, $path, $output)
     {
@@ -1241,6 +1241,7 @@ public function copyConfigFilesToNewLocation(OutputInterface $output)
 
     /**
      * @param $path
+     * @param bool|null|string|string[] $path
      */
     public function removeUnUsedFiles(OutputInterface $output, $path)
     {

diff --git a/src/Command/Common/DatabaseCommand.php b/src/Command/Common/DatabaseCommand.php
@@ -55,10 +55,7 @@ protected function configure(): void
             );
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $configurationFile = $input->getOption('conf');
@@ -103,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         '<comment>Try</comment> <info>prefix:command --conf=/var/www/chamilo/config/configuration.php</info>'
                     );
 
-                    return false;
+                    return 0;
                 }
             }
         }
@@ -135,5 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Setting doctrine connection
         $this->setDatabaseSettings($databaseSettings);
         $this->setDoctrineSettings($this->getHelperSet());
+
+        return 0;
     }
 }
diff --git a/src/Command/Common/InfoCommand.php b/src/Command/Common/InfoCommand.php
@@ -20,12 +20,11 @@ protected function configure(): void
             );
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $configuration = $input->getOption('conf');
         $this->getHelper('configuration')->readConfigurationFile($configuration);
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/DropDatabaseCommand.php b/src/Command/Database/DropDatabaseCommand.php
@@ -21,9 +21,9 @@ protected function configure(): void
     }
 
     /**
-     * @return int|void|null
+     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
 
@@ -62,5 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln("<comment>Can't established connection with the database. Probably it was already deleted.</comment>");
         }
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/DumpCommand.php b/src/Command/Database/DumpCommand.php
@@ -23,16 +23,13 @@ protected function configure(): void
             ->setDescription('Outputs a dump of the database');
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $_configuration = $this->getConfigurationArray();
         $dump = 'mysqldump -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p'.$_configuration['db_password'].' '.$_configuration['main_database'];
         system($dump);
 
-        return null;
+        return 0;
     }
 }
diff --git a/src/Command/Database/FullBackupCommand.php b/src/Command/Database/FullBackupCommand.php
@@ -48,10 +48,7 @@ protected function configure(): void
             );
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
 
@@ -107,5 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln(
             '<comment>End Chamilo backup. File can be found here: '.realpath($resultPath).' </comment>'
         );
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/ImportCommand.php b/src/Command/Database/ImportCommand.php
@@ -58,9 +58,6 @@ protected function configure(): void
             );
     }
 
-    /**
-     * @see Console\Command\Command
-     */
     protected function execute(Console\Input\InputInterface $input, Console\Output\OutputInterface $output)
     {
         $conn = $this->getHelper('db')->getConnection();
@@ -117,5 +114,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
                 }
             }
         }
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/RestoreCommand.php b/src/Command/Database/RestoreCommand.php
@@ -32,9 +32,9 @@ protected function configure(): void
     }
 
     /**
-     * @return int|void|null
+     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $dumpPath = $input->getArgument('file');
@@ -48,5 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('<comment>File is not a valid SQL file: '.$dumpPath.' </comment>');
         }
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/RunSQLCommand.php b/src/Command/Database/RunSQLCommand.php
@@ -24,10 +24,7 @@ protected function configure(): void
         $this->setHelp('Prompts a SQL cli');
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $output->writeln('Starting Chamilo SQL cli');
@@ -60,5 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Inside execute function
         //$output->getFormatter()->setStyle('fcbarcelona', new OutputFormatterStyle('red', 'blue', array('blink', 'bold', 'underscore')));
         //$output->writeln('<fcbarcelona>Messi for the win</fcbarcelona>');
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/SQLCountCommand.php b/src/Command/Database/SQLCountCommand.php
@@ -30,9 +30,9 @@ protected function configure(): void
     /**
      * @todo use doctrine
      *
-     * @return int|void|null
+     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $table = $input->getArgument('table');
@@ -52,5 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 "<comment>Table '$table' does not exists in the database: ".$_configuration['main_database']
             );
         }
+
+        return 0;
     }
 }
diff --git a/src/Command/Database/ShowConnInfoCommand.php b/src/Command/Database/ShowConnInfoCommand.php
@@ -21,10 +21,7 @@ protected function configure(): void
             ->setDescription('Shows database connection credentials for the current Chamilo install');
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
 
@@ -45,5 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln("DB:\t".$_configuration['main_database']);
         $output->writeln('Connection string (add password manually for increased security:');
         $output->writeln('mysql -h '.$_configuration['db_host'].' -u '.$_configuration['db_user'].' -p '.$_configuration['main_database']."\n");
+
+        return 0;
     }
 }
diff --git a/src/Command/Email/SendEmailCommand.php b/src/Command/Email/SendEmailCommand.php
@@ -63,10 +63,7 @@ protected function configure(): void
             );
     }
 
-    /**
-     * @return void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $mailLib = $this->getHelper('configuration')->getLibFile('mail.lib.inc.php');
@@ -135,6 +132,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        return null;
+        return 0;
     }
 }
diff --git a/src/Command/Files/CleanConfigFilesCommand.php b/src/Command/Files/CleanConfigFilesCommand.php
@@ -22,9 +22,9 @@ protected function configure(): void
     }
 
     /**
-     * @return int|void|null
+     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $this->writeCommandHeader($output, 'Cleaning config files.');
@@ -39,5 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $files = $this->getConfigurationHelper()->getConfigFiles();
         $this->removeFiles($files, $output);
+
+        return 0;
     }
 }
diff --git a/src/Command/Files/CleanCoursesFilesCommand.php b/src/Command/Files/CleanCoursesFilesCommand.php
@@ -22,10 +22,7 @@ protected function configure(): void
             ->setDescription('Cleans the courses directory');
     }
 
-    /**
-     * @return bool|int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $this->writeCommandHeader($output, 'Cleaning folders in courses directory.');
@@ -40,5 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $files = $this->getConfigurationHelper()->getCoursesFiles();
         $this->removeFiles($files, $output);
+
+        return 0;
     }
 }
diff --git a/src/Command/Files/CleanDeletedDocumentsCommand.php b/src/Command/Files/CleanDeletedDocumentsCommand.php
@@ -48,10 +48,7 @@ protected function configure(): void
         ;
     }
 
-    /**
-     * @return bool|int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $category = $input->getOption('category');
@@ -123,5 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
         $this->removeFiles($files, $output);
+
+        return 0;
     }
 }
diff --git a/src/Command/Files/CleanTempFolderCommand.php b/src/Command/Files/CleanTempFolderCommand.php
@@ -21,10 +21,7 @@ protected function configure(): void
             ->setDescription('Cleans the temp directory.');
     }
 
-    /**
-     * @return bool|int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
         $this->writeCommandHeader($output, 'Cleaning temp files.');
@@ -38,5 +35,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $files = $this->getConfigurationHelper()->getTempFiles();
         $this->removeFiles($files, $output);
+
+        return 0;
     }
 }