gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-03-04 11:59:58 -03:00
commit b3e42920a2
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
- issue #16851 Fix ($cfg['Order']) default column order doesn't have have any effect since phpMyAdmin 4.2.0
- issue #18112 Fix open base dir warning on git version class
- issue Do not show "Original length undefined" on binary hex columns
- issue Fix wrong time zone when handling Git information
5.2.1 (2023-02-07)
- issue #17522 Fix case where the routes cache file is invalid

11
libraries/classes/Git.php
View File

@ -4,6 +4,8 @@ declare(strict_types=1);
namespace PhpMyAdmin;
use DateTimeImmutable;
use DateTimeZone;
use DirectoryIterator;
use PhpMyAdmin\Utils\HttpRequest;
use stdClass;
@ -13,7 +15,6 @@ use function array_shift;
use function basename;
use function bin2hex;
use function count;
use function date;
use function explode;
use function fclose;
use function file_exists;
@ -384,14 +385,14 @@ class Git
$user = $datalinearr[1];
preg_match('/([^<]+)<([^>]+)> ([0-9]+)( [^ ]+)?/', $user, $user);
$timezone = new DateTimeZone($user[4] ?? '+0000');
$date = (new DateTimeImmutable())->setTimestamp((int) $user[3])->setTimezone($timezone);
$user2 = [
'name' => trim($user[1]),
'email' => trim($user[2]),
'date' => date('Y-m-d H:i:s', (int) $user[3]),
'date' => $date->format('Y-m-d H:i:s O'),
];
if (isset($user[4])) {
$user2['date'] .= $user[4];
}
if ($linetype === 'author') {
$author = $user2;

4
test/classes/GitTest.php
View File

@ -468,12 +468,12 @@ class GitTest extends AbstractTestCase
[
'name' => 'William Desportes',
'email' => 'williamdes@wdes.fr',
'date' => '2022-07-13 12:56:40 +0200',
'date' => '2022-07-13 14:56:40 +0200',
],
[
'name' => 'William Desportes',
'email' => 'williamdes@wdes.fr',
'date' => '2022-07-13 12:56:40 +0200',
'date' => '2022-07-13 14:56:40 +0200',
],
'Remove ignore config.inc.php for psalm because '
. 'it fails the CI Signed-off-by: William Desportes <williamdes@wdes.fr>',