[phpMyAdmin Git] [phpmyadmin/phpmyadmin] af18dc: Fix #15877 - preg_match() expects parameter 2 to be string, null given

[William Desportes]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: af18dcec6b106d18e8cedbd97d320d946df32c7e
https://github.com/phpmyadmin/phpmyadmin/commit/af18dcec6b106d18e8cedbd97d320d946df32c7e
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M libraries/classes/Display/Results.php

Log Message:
-----------
Fix #15877 - preg_match() expects parameter 2 to be string, null given

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: a49e05111a0d3ee8aa0af505762127dc4c1883d9
https://github.com/phpmyadmin/phpmyadmin/commit/a49e05111a0d3ee8aa0af505762127dc4c1883d9
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog entry for #15877

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 48926bc5dffe8d5016a61afa30c3a9880216ba3a
https://github.com/phpmyadmin/phpmyadmin/commit/48926bc5dffe8d5016a61afa30c3a9880216ba3a
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M libraries/classes/Display/Results.php

Log Message:
-----------
Fix possible php errors reported by phpstan

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 55fcbe11924cfbbb7474c7264862c345dc50ea92
https://github.com/phpmyadmin/phpmyadmin/commit/55fcbe11924cfbbb7474c7264862c345dc50ea92
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M ChangeLog
M libraries/classes/Display/Results.php
M phpstan-baseline.neon

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 71a02a92d43c946eb67fa161fffe5ad806e7fd46
https://github.com/phpmyadmin/phpmyadmin/commit/71a02a92d43c946eb67fa161fffe5ad806e7fd46
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M libraries/classes/Util.php
M test/classes/UtilTest.php

Log Message:
-----------
Fix edge cases on #15200 - server-side HTTPS detection misses support for Forwarded HTTP Extension (RFC 7239)

Ref: https://github.com/phpmyadmin/phpmyadmin/commit/6729c89b1775b48f6fb636e27279ab94c91f79da#r37198800
Ref: https://github.com/phpmyadmin/phpmyadmin/commit/6729c89b1775b48f6fb636e27279ab94c91f79da#r37198800

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 349a2f17bb7a399c6e4156da266c6318a5e8c6e4
https://github.com/phpmyadmin/phpmyadmin/commit/349a2f17bb7a399c6e4156da266c6318a5e8c6e4
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-02-11 (Tue, 02 February 2020) +01:00

Changed paths: 
M libraries/classes/Util.php
M test/classes/UtilTest.php

Log Message:
-----------
Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes at wdes.fr>