diff options
| -rw-r--r-- | includes/installer/CliInstaller.php | 2 | ||||
| -rw-r--r-- | includes/installer/InstallerOverrides.php | 2 | ||||
| -rw-r--r-- | includes/installer/PostgresSettingsForm.php | 2 | ||||
| -rw-r--r-- | includes/installer/SqliteConnectForm.php | 2 | ||||
| -rw-r--r-- | includes/installer/SqliteDatabaseCreator.php | 2 | ||||
| -rw-r--r-- | includes/installer/Task/CreateExternalDomainsTask.php | 4 | ||||
| -rw-r--r-- | includes/installer/Task/CreateSysopTask.php | 2 | ||||
| -rw-r--r-- | includes/installer/Task/PostgresCreateUserTask.php | 2 | ||||
| -rw-r--r-- | includes/installer/Task/RestoredServicesProvider.php | 3 | ||||
| -rw-r--r-- | includes/installer/Task/SqliteCreateDatabaseTask.php | 2 | ||||
| -rw-r--r-- | includes/installer/Task/TaskFactory.php | 2 |
11 files changed, 13 insertions, 12 deletions
diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 8a17085d7029..ec3c20b572c2 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -175,7 +175,7 @@ class CliInstaller extends Installer { $this->setVar( '_WithDevelopmentSettings', isset( $options['with-developmentsettings'] ) ); } - private function validateExtensions( $type, $directory, $nameLists ) { + private function validateExtensions( string $type, string $directory, $nameLists ): Status { $extensions = []; $status = new Status; foreach ( (array)$nameLists as $nameList ) { diff --git a/includes/installer/InstallerOverrides.php b/includes/installer/InstallerOverrides.php index b476479b7971..eadbe7d8d004 100644 --- a/includes/installer/InstallerOverrides.php +++ b/includes/installer/InstallerOverrides.php @@ -29,7 +29,7 @@ use MediaWiki\Request\WebRequest; * @since 1.20 */ class InstallerOverrides { - private static function getOverrides() { + private static function getOverrides(): array { static $overrides; if ( !$overrides ) { diff --git a/includes/installer/PostgresSettingsForm.php b/includes/installer/PostgresSettingsForm.php index f74136498b2d..f16ab4695f7a 100644 --- a/includes/installer/PostgresSettingsForm.php +++ b/includes/installer/PostgresSettingsForm.php @@ -94,7 +94,7 @@ class PostgresSettingsForm extends DatabaseSettingsForm { return $this->dbInstaller; } - private function getPostgresUtils() { + private function getPostgresUtils(): PostgresUtils { return new PostgresUtils( $this->dbInstaller ); } diff --git a/includes/installer/SqliteConnectForm.php b/includes/installer/SqliteConnectForm.php index 4080dd3808b6..060178a8b20e 100644 --- a/includes/installer/SqliteConnectForm.php +++ b/includes/installer/SqliteConnectForm.php @@ -55,7 +55,7 @@ class SqliteConnectForm extends DatabaseConnectForm { return realpath( $path ) ?: $path; } - private function getSqliteUtils() { + private function getSqliteUtils(): SqliteUtils { return new SqliteUtils; } diff --git a/includes/installer/SqliteDatabaseCreator.php b/includes/installer/SqliteDatabaseCreator.php index 298dad63c75f..53c2b0281d21 100644 --- a/includes/installer/SqliteDatabaseCreator.php +++ b/includes/installer/SqliteDatabaseCreator.php @@ -34,7 +34,7 @@ class SqliteDatabaseCreator extends DatabaseCreator { return $this->createLocally( $database ); } - private function makeStubDBFile( $db ) { + private function makeStubDBFile( string $db ): Status { $file = DatabaseSqlite::generateFileName( $this->dataDir, $db ); if ( file_exists( $file ) ) { diff --git a/includes/installer/Task/CreateExternalDomainsTask.php b/includes/installer/Task/CreateExternalDomainsTask.php index dba40ffdb268..db14fd4bfd2f 100644 --- a/includes/installer/Task/CreateExternalDomainsTask.php +++ b/includes/installer/Task/CreateExternalDomainsTask.php @@ -40,7 +40,7 @@ class CreateExternalDomainsTask extends Task { $this->esFactory = $services->getExternalStoreFactory(); } - private function createVirtualDomains() { + private function createVirtualDomains(): Status { $status = Status::newGood(); foreach ( $this->getVirtualDomains() as $virtualDomain ) { if ( !$this->shouldDoShared() @@ -62,7 +62,7 @@ class CreateExternalDomainsTask extends Task { return $status; } - private function createExternalStoreDomains() { + private function createExternalStoreDomains(): Status { $status = Status::newGood(); $localDomainId = $this->lbFactory->getLocalDomainID(); foreach ( $this->esFactory->getWriteBaseUrls() as $url ) { diff --git a/includes/installer/Task/CreateSysopTask.php b/includes/installer/Task/CreateSysopTask.php index cf626819487f..a8ff8d386caf 100644 --- a/includes/installer/Task/CreateSysopTask.php +++ b/includes/installer/Task/CreateSysopTask.php @@ -38,7 +38,7 @@ class CreateSysopTask extends Task { return $status; } - private function createUser( $name ) { + private function createUser( string $name ): Status { $user = $this->userFactory->newFromName( $name ); if ( !$user ) { diff --git a/includes/installer/Task/PostgresCreateUserTask.php b/includes/installer/Task/PostgresCreateUserTask.php index b2487ad68d6d..8a05bbb770ec 100644 --- a/includes/installer/Task/PostgresCreateUserTask.php +++ b/includes/installer/Task/PostgresCreateUserTask.php @@ -60,7 +60,7 @@ class PostgresCreateUserTask extends Task { return Status::newGood(); } - private function getPostgresUtils() { + private function getPostgresUtils(): PostgresUtils { return new PostgresUtils( $this->getContext() ); } } diff --git a/includes/installer/Task/RestoredServicesProvider.php b/includes/installer/Task/RestoredServicesProvider.php index 7cb64c69f8c2..50a82e9b6d7f 100644 --- a/includes/installer/Task/RestoredServicesProvider.php +++ b/includes/installer/Task/RestoredServicesProvider.php @@ -8,6 +8,7 @@ use MediaWiki\Status\Status; use MediaWiki\Utils\UrlUtils; use MWLBFactory; use Wikimedia\Rdbms\LBFactorySingle; +use Wikimedia\Services\ServiceContainer; /** * Provide a service container with storage enabled. @@ -57,7 +58,7 @@ class RestoredServicesProvider extends Task { return Status::newGood(); } - private function resetMediaWikiServices( $serviceOverrides ) { + private function resetMediaWikiServices( array $serviceOverrides ): ServiceContainer { // Reset all services and inject config overrides. MediaWikiServices::resetGlobalInstance( null, 'reload' ); diff --git a/includes/installer/Task/SqliteCreateDatabaseTask.php b/includes/installer/Task/SqliteCreateDatabaseTask.php index a83deb56a299..204a572ed06a 100644 --- a/includes/installer/Task/SqliteCreateDatabaseTask.php +++ b/includes/installer/Task/SqliteCreateDatabaseTask.php @@ -113,7 +113,7 @@ EOT; return $mainConnStatus; } - private function getSqliteUtils() { + private function getSqliteUtils(): SqliteUtils { return new SqliteUtils; } diff --git a/includes/installer/Task/TaskFactory.php b/includes/installer/Task/TaskFactory.php index 5d7faf18267c..337ce788f3fa 100644 --- a/includes/installer/Task/TaskFactory.php +++ b/includes/installer/Task/TaskFactory.php @@ -146,7 +146,7 @@ class TaskFactory { return $task; } - private function getCoreSchemaBasePath() { + private function getCoreSchemaBasePath(): string { return MW_INSTALL_PATH . '/sql'; } } |