[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9102b9: Fix broken tests with PHPUnit 8.2

2019-06-08 Thread Maurício Meneghini Fauth
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9102b98ede9ec3308f0711fa7679565a44347720
https://github.com/phpmyadmin/phpmyadmin/commit/9102b98ede9ec3308f0711fa7679565a44347720
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

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

Log Message:
---
Fix broken tests with PHPUnit 8.2

Signed-off-by: Maurício Meneghini Fauth 

___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3f0ef0: Add support for Twig 2

2019-06-08 Thread Maurício Meneghini Fauth
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3f0ef0f288381fe273edffe444ef35bb27f5cf76
https://github.com/phpmyadmin/phpmyadmin/commit/3f0ef0f288381fe273edffe444ef35bb27f5cf76
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M composer.json

Log Message:
---
Add support for Twig 2

Signed-off-by: Maurício Meneghini Fauth 

Commit: 665e385fac362941512f8a2ceb8cf4b0454d3f83
https://github.com/phpmyadmin/phpmyadmin/commit/665e385fac362941512f8a2ceb8cf4b0454d3f83
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M composer.json

Log Message:
---
Merge pull request #15313 from mauriciofauth/twig2-4.9

Add support for Twig 2

Commit: 338cfb31cc4150a225e63404c4afed0e184d20d4
https://github.com/phpmyadmin/phpmyadmin/commit/338cfb31cc4150a225e63404c4afed0e184d20d4
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M ChangeLog

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

Add support for Twig 2

[ci skip]

Signed-off-by: Maurício Meneghini Fauth 

Commit: f51806bcfab54fa1bca405ca893a13b9ed7e85c2
https://github.com/phpmyadmin/phpmyadmin/commit/f51806bcfab54fa1bca405ca893a13b9ed7e85c2
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M ChangeLog

Log Message:
---
Merge branch 'QA_4_9'

Signed-off-by: Maurício Meneghini Fauth 

___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 338cfb: Add ChangeLog entry for #15313

2019-06-08 Thread Maurício Meneghini Fauth
Branch: refs/heads/QA_4_9
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 338cfb31cc4150a225e63404c4afed0e184d20d4
https://github.com/phpmyadmin/phpmyadmin/commit/338cfb31cc4150a225e63404c4afed0e184d20d4
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M ChangeLog

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

Add support for Twig 2

[ci skip]

Signed-off-by: Maurício Meneghini Fauth 

___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3f0ef0: Add support for Twig 2

2019-06-08 Thread Maurício Meneghini Fauth
Branch: refs/heads/QA_4_9
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3f0ef0f288381fe273edffe444ef35bb27f5cf76
https://github.com/phpmyadmin/phpmyadmin/commit/3f0ef0f288381fe273edffe444ef35bb27f5cf76
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M composer.json

Log Message:
---
Add support for Twig 2

Signed-off-by: Maurício Meneghini Fauth 

Commit: 665e385fac362941512f8a2ceb8cf4b0454d3f83
https://github.com/phpmyadmin/phpmyadmin/commit/665e385fac362941512f8a2ceb8cf4b0454d3f83
Author: Maurício Meneghini Fauth 
Date: 2019-06-08 (Sat, 06 June 2019) -03:00

Changed paths: 
M composer.json

Log Message:
---
Merge pull request #15313 from mauriciofauth/twig2-4.9

Add support for Twig 2

___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker] 21be77: Remove GPG verification of downloads, since we don't sign snapshot

2019-06-08 Thread Isaac Bennetch
Branch: refs/heads/edge-4.9
Home: https://github.com/phpmyadmin/docker
Commit: 21be77a8e8d4e9118d8a32de66bdb4e042d02726
https://github.com/phpmyadmin/docker/commit/21be77a8e8d4e9118d8a32de66bdb4e042d02726
Author: Isaac Bennetch 
Date: 2019-06-08 (Sat, 06 June 2019) -04:00

Changed paths: 
M Dockerfile-alpine.template
M Dockerfile-debian.template
M apache/Dockerfile
M fpm-alpine/Dockerfile
M fpm/Dockerfile

Log Message:
---
Remove GPG verification of downloads, since we don't sign snapshot
builds.

See also: #131

Fixes: #228

Signed-off-by: Isaac Bennetch 

Commit: 8803357e6af70a20c3aafff3f89a7db1064d542c
https://github.com/phpmyadmin/docker/commit/8803357e6af70a20c3aafff3f89a7db1064d542c
Author: Isaac Bennetch 
Date: 2019-06-08 (Sat, 06 June 2019) -04:00

Changed paths: 
M Dockerfile-alpine.template
M Dockerfile-debian.template
M apache/Dockerfile
M fpm-alpine/Dockerfile
M fpm/Dockerfile

Log Message:
---
Configure to use snapshot builds for 4.9 series

Signed-off-by: Isaac Bennetch 

___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git