makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16955] Resolve incompatibilities with doctum

Browse source 
PHPBB3-16955
This commit is contained in:
Marc Alexander 2022-12-27 19:52:14 +01:00
parent eeeb69b4ae
commit cedd447659
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/phpbb/db/doctrine/table_helper.php
View file

@ -21,7 +21,8 @@ class table_helper
* *
* @param array $column_data Column data. * @param array $column_data Column data.
* *
* @return array{string, array} A pair of type and array of column options. * @return array<string, array> A pair of type and array of column options.
* @psalm-return array{string, array}
*/ */
public static function convert_column_data(array $column_data, string $dbms_layer): array public static function convert_column_data(array $column_data, string $dbms_layer): array
{ {

3
phpBB/phpbb/db/doctrine/type_converter.php
View file

@ -54,7 +54,8 @@ class type_converter
* *
* @param string $type Legacy type name * @param string $type Legacy type name
* *
* @return array{string, array} Pair of type name and options. * @return array<string, array> Pair of type name and options.
* @psalm-return array{string, array}
*/ */
public static function convert(string $type, string $dbms): array public static function convert(string $type, string $dbms): array
{ {

3
phpBB/phpbb/db/driver/driver.php
View file

@ -1102,7 +1102,8 @@ abstract class driver implements driver_interface
/** /**
* Return sql error array * Return sql error array
* *
* @return array{message: string, code: int|string} SQL error array with message and error code * @return array SQL error array with message and error code
* @psalm-return array{message: string, code: int|string}
*/ */
abstract protected function _sql_error(): array; abstract protected function _sql_error(): array;

3
phpBB/phpbb/db/migrator.php
View file

@ -651,7 +651,8 @@ class migrator
* @param array $steps The steps to run * @param array $steps The steps to run
* @param bool|string $state Current state of the migration * @param bool|string $state Current state of the migration
* @param bool $revert true to revert a data step * @param bool $revert true to revert a data step
* @return bool|array{result: mixed, step: int} migration state. True if completed, serialized array if not finished * @return bool|array migration state. True if completed, serialized array if not finished
* @psalm-return bool|array{result: mixed, step: int}
* @throws \phpbb\db\migration\exception * @throws \phpbb\db\migration\exception
*/ */
protected function process_data_step($steps, $state, $revert = false) protected function process_data_step($steps, $state, $revert = false)

3
phpBB/phpbb/event/md_exporter.php
View file

@ -461,7 +461,8 @@ class md_exporter
* Validate "Changed" Information * Validate "Changed" Information
* *
* @param string $changed * @param string $changed
* @return array{string, string} Changed information containing version and description in respective order * @return array<string, string> Changed information containing version and description in respective order
* @psalm-return array{string, string}
* @throws \LogicException * @throws \LogicException
*/ */
public function validate_changed($changed) public function validate_changed($changed)

3
phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
View file

@ -82,7 +82,8 @@ class ajax_iohandler extends iohandler_base
protected $redirect_url; protected $redirect_url;
/** /**
* @var resource|closed-resource * @var resource
* @psalm-var resource|closed-resource
*/ */
protected $file_lock_pointer; protected $file_lock_pointer;