keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Type hinting & call bugfixing

Browse source
This commit is contained in:
Philipp Holzer 2018-10-14 10:37:19 +02:00
parent c32ac7f194
commit 248c1b8074
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Console/AutomaticInstallation.php
View file

@ -184,7 +184,7 @@ HELP;
/** /**
* @param Install $install the Installer instance * @param Install $install the Installer instance
*/ */
private function runBasicChecks($install) private function runBasicChecks(Install $install)
{ {
$install->resetChecks(); $install->resetChecks();
$install->checkFunctions(); $install->checkFunctions();

8
src/Core/Install.php
View file

@ -190,7 +190,7 @@ class Install
$phppath = ""; $phppath = "";
} }
self::addCheck(L10n::t('Command line PHP') . ($passed ? " (<tt>$phppath</tt>)" : ""), $passed, false, $help); $this->addCheck(L10n::t('Command line PHP') . ($passed ? " (<tt>$phppath</tt>)" : ""), $passed, false, $help);
if ($passed) { if ($passed) {
$cmd = "$phppath -v"; $cmd = "$phppath -v";
@ -202,7 +202,7 @@ class Install
$help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL; $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
$help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>"; $help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";
} }
self::addCheck(L10n::t('PHP cli binary'), $passed2, true, $help); $this->addCheck(L10n::t('PHP cli binary'), $passed2, true, $help);
} else { } else {
// return if it was required // return if it was required
return $required; return $required;
@ -221,7 +221,7 @@ class Install
$this->phppath = $phppath; $this->phppath = $phppath;
} }
self::addCheck(L10n::t('PHP register_argc_argv'), $passed3, true, $help); $this->addCheck(L10n::t('PHP register_argc_argv'), $passed3, true, $help);
} }
// passed2 & passed3 are required if first check passed // passed2 & passed3 are required if first check passed
@ -408,7 +408,7 @@ class Install
$help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL; $help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;
} }
self::addCheck(L10n::t('config/local.ini.php is writable'), $status, false, $help); $this->addCheck(L10n::t('config/local.ini.php is writable'), $status, false, $help);
// Local INI File is not required // Local INI File is not required
return true; return true;