diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index 9b38db6b8..6e2cddd75 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -3,7 +3,7 @@ // // This file is part of iTop. // -// iTop is free software; you can redistribute it and/or modify +// iTop is free software; you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. @@ -149,10 +149,10 @@ class DBBackup * @param string $sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php} * @param \DateTime|null $oDateTime Date time to use for the name * - * @return string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`) + * @return ?string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`) * @since 3.1.0 N°5279 Add $oDateTime parameter */ - public function MakeName(string $sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null) + public function MakeName(?string $sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null) { if ($oDateTime === null) { $oDateTime = new DateTime(); @@ -222,7 +222,7 @@ class DBBackup * * @param string $sSourceConfigFile * @param string $sTmpFolder - * @param bool $bSkipSQLDumpForTesting + * @param bool $bSkipSQLDumpForTesting * * @return array list of files to archive * @throws \Exception @@ -273,7 +273,7 @@ class DBBackup if(!file_exists(APPROOT.'/'.$sExtraFileOrDir)) { continue; // Ignore non-existing files } - + $sExtraFullPath = utils::RealPath(APPROOT.'/'.$sExtraFileOrDir, APPROOT); if ($sExtraFullPath === false) {