mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 20:24:08 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Clean up installer classes for psalm

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-26 14:42:23 +01:00
parent d9c179f9ef
commit 40e8a737c3
22 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
View File

@@ -82,7 +82,7 @@ class ajax_iohandler extends iohandler_base
protected $redirect_url;
/**
* @var resource
* @var resource|closed-resource
*/
protected $file_lock_pointer;
@@ -235,7 +235,9 @@ class ajax_iohandler extends iohandler_base
'form_install' => 'installer_form.html',
));
return $this->template->assign_display('form_install');
$compiled_template = $this->template->assign_display('form_install');
return is_string($compiled_template) ? $compiled_template : '';
}
/**

4
phpBB/phpbb/install/helper/iohandler/cli_iohandler.php
View File

@@ -188,11 +188,11 @@ class cli_iohandler extends iohandler_base
/**
* {@inheritdoc
*/
public function add_success_message($error_title, $error_description = false)
public function add_success_message($success_title, $success_description = false)
{
$this->io->newLine();
$message = $this->translate_message($error_title, $error_description);
$message = $this->translate_message($success_title, $success_description);
$message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
$this->io->success($message_string);

9
phpBB/phpbb/install/helper/iohandler/factory.php
View File

@@ -52,7 +52,7 @@ class factory
/**
* Factory getter for iohandler
*
* @return \phpbb\install\helper\iohandler\iohandler_interface
* @return \phpbb\install\helper\iohandler\iohandler_interface|null
*
* @throws iohandler_not_implemented_exception
* When the specified iohandler_interface does not exists
@@ -63,17 +63,16 @@ class factory
{
case 'ajax':
return $this->container->get('installer.helper.iohandler_ajax');
break;
case 'nojs':
// @todo replace this
return $this->container->get('installer.helper.iohandler_ajax');
break;
case 'cli':
return $this->container->get('installer.helper.iohandler_cli');
break;
default:
throw new iohandler_not_implemented_exception();
break;
}
}
}