[phpMyAdmin Git] [phpmyadmin/phpmyadmin] af835b: Fix ErrorHandler sliceErrors not returning errors

Craig McNeill craig at mmddata.ca
Sun Aug 22 23:26:02 CEST 2021


Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: af835bc52ced34f2ee183d9e1aa0bc5bb102da28
https://github.com/phpmyadmin/phpmyadmin/commit/af835bc52ced34f2ee183d9e1aa0bc5bb102da28
Author: Craig McNeill <craig at mmddata.ca>
Date: 2021-08-18 (Wed, 08 August 2021) -04:00

Changed paths: 
M libraries/classes/ErrorHandler.php
M test/classes/ErrorHandlerTest.php

Log Message:
-----------
Fix ErrorHandler sliceErrors not returning errors
Signed-off-by: Craig McNeill <craig at mmddata.ca>

Commit: 38c263359edc3437749206c082496211eaa95d7a
https://github.com/phpmyadmin/phpmyadmin/commit/38c263359edc3437749206c082496211eaa95d7a
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-20 (Fri, 08 August 2021) +02:00

Changed paths: 
M libraries/classes/ErrorHandler.php
M test/classes/ErrorHandlerTest.php

Log Message:
-----------
Ref #17084 - comment the code and add a new test case

And fix the modified test

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

Commit: 7ede52af55796f1e68f742b5f4ce7073ede255a0
https://github.com/phpmyadmin/phpmyadmin/commit/7ede52af55796f1e68f742b5f4ce7073ede255a0
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M libraries/classes/ErrorHandler.php
M test/classes/ErrorHandlerTest.php

Log Message:
-----------
Merge #17085 - Fix #17084 - ErrorHandler sliceErrors not returning errors

Pull-request: #17085
Fixes: #17084

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

Commit: 3b69585d1e942312419b2cfc52cf24f4ece06fb0
https://github.com/phpmyadmin/phpmyadmin/commit/3b69585d1e942312419b2cfc52cf24f4ece06fb0
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #17084

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

Commit: a1e473ab660795514e94c45aaf167413342bef12
https://github.com/phpmyadmin/phpmyadmin/commit/a1e473ab660795514e94c45aaf167413342bef12
Author: Lukas Bixen <lrb2_ at outlook.com>
Date: 2021-08-21 (Sat, 08 August 2021) -05:00

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

Log Message:
-----------
Fix #17062: Improve uniqueness of SQL query hashes
Use server and database in addition to query when generating hash

Signed-off-by: Lukas Bixen <lrb2_ at outlook.com>

Commit: ae6f6604ef6f2aba8d66715ae5ee08e39c6f6f4e
https://github.com/phpmyadmin/phpmyadmin/commit/ae6f6604ef6f2aba8d66715ae5ee08e39c6f6f4e
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/create-release.sh

Log Message:
-----------
Fail when the user uses the wrong branch (script) to release a phpMyAdmin version

This avoids having corrupt builds because build methods differ between series.

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

Commit: 731701ab08eb38a3e47a35908b88e3f1aca7f8d3
https://github.com/phpmyadmin/phpmyadmin/commit/731701ab08eb38a3e47a35908b88e3f1aca7f8d3
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/create-release.sh

Log Message:
-----------
Add security checkups between steps of the release script

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

Commit: 149b52c5547e2194622dd7cee9de948306dfd32f
https://github.com/phpmyadmin/phpmyadmin/commit/149b52c5547e2194622dd7cee9de948306dfd32f
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/create-release.sh

Log Message:
-----------
Remove old QA 4.9 logic from the release script

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

Commit: d6e35143c04fc1348e3f44f1d63bce627a5792d8
https://github.com/phpmyadmin/phpmyadmin/commit/d6e35143c04fc1348e3f44f1d63bce627a5792d8
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/check-release-excludes.sh

Log Message:
-----------
Add a new file to search for in excludes: .php-cs-fixer.dist.php

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

Commit: 50479c3d39d802ca7900e5da0c50fb7eb127b8fb
https://github.com/phpmyadmin/phpmyadmin/commit/50479c3d39d802ca7900e5da0c50fb7eb127b8fb
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/check-release-excludes.sh

Log Message:
-----------
Add the uppercase variant of "test" "Test" to the detection script

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

Commit: f2d80a2a006be94f45ef3e3e41d870bfc6bc0edc
https://github.com/phpmyadmin/phpmyadmin/commit/f2d80a2a006be94f45ef3e3e41d870bfc6bc0edc
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/create-release.sh

Log Message:
-----------
Exclude some missed test folders from the release bundle

- Exclude folder symfony/service-contracts/Test
- Exclude folder psr/log/Psr/Log/Test
- Exclude folder twig/twig/src/Test

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

Commit: 7e992fa7c98eb633cc1b15895b7a09407453fd5f
https://github.com/phpmyadmin/phpmyadmin/commit/7e992fa7c98eb633cc1b15895b7a09407453fd5f
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M scripts/check-release-excludes.sh

Log Message:
-----------
Exclude Twig false positives on vendor bundle check script

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

Commit: c905b8c99283bf585a351d2f484dcd449cd61078
https://github.com/phpmyadmin/phpmyadmin/commit/c905b8c99283bf585a351d2f484dcd449cd61078
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

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

Log Message:
-----------
Merge #17070 - Fix #17062 - Pagination issues when working with identically named tables in separate databases

Pull-request: #17070
Fixes: #17062

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

Commit: 465066990a4521f4f76894a24f12a2c4bc6333b7
https://github.com/phpmyadmin/phpmyadmin/commit/465066990a4521f4f76894a24f12a2c4bc6333b7
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #17062

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

Commit: 8f4514c7e943608b789de75da49268159897482e
https://github.com/phpmyadmin/phpmyadmin/commit/8f4514c7e943608b789de75da49268159897482e
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

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

Log Message:
-----------
Fix #17046 - "Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, null given"

Fixes: #17046

"libraries/classes/Display/Results.php not guarding against null metadata in getHeaderTablesForColumns"

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

Commit: dab66689539b91e3e1bed5b94984916e3155547f
https://github.com/phpmyadmin/phpmyadmin/commit/dab66689539b91e3e1bed5b94984916e3155547f
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #17046

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

Commit: 8d19bef81d6dfc987c3705976c9aee0c508a90d1
https://github.com/phpmyadmin/phpmyadmin/commit/8d19bef81d6dfc987c3705976c9aee0c508a90d1
Author: William Desportes <williamdes at wdes.fr>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M ChangeLog
M libraries/classes/Display/Results.php
M libraries/classes/ErrorHandler.php
M scripts/check-release-excludes.sh
M scripts/create-release.sh
M test/classes/ErrorHandlerTest.php

Log Message:
-----------
Merge branch 'QA_5_1'

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

Commit: 13807a1049c1eb58f4acd61a7740387a1114631c
https://github.com/phpmyadmin/phpmyadmin/commit/13807a1049c1eb58f4acd61a7740387a1114631c
Author: Lukas Bixen <lrb2_ at outlook.com>
Date: 2021-08-22 (Sun, 08 August 2021) +02:00

Changed paths: 
M test/classes/Display/ResultsTest.php

Log Message:
-----------
Fix ResultsTest after pull-request #17070

Signed-off-by: Lukas Bixen <lrb2_ at outlook.com>



More information about the Git mailing list