- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 2f24a3: Add missing use statements in Template class
by Maurício Meneghini Fauth 16 Jun '20

16 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2f24a3f78504d2f281d8f20db9a833b8723c78ec https://github.com/phpmyadmin/phpmyadmin/commit/2f24a3f78504d2f281d8f20db9a… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2020-06-16 (Tue, 06 June 2020) -03:00 Changed paths: M libraries/classes/Template.php Log Message: ----------- Add missing use statements in Template class Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] a786f8: Translated using Weblate (Czech)
by Petr Duda 16 Jun '20

16 Jun '20

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a786f873ebb40960878e422a3653f8632fe817ca https://github.com/phpmyadmin/phpmyadmin/commit/a786f873ebb40960878e422a365… Author: Petr Duda <petrduda(a)seznam.cz> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 100.0% (3334 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/cs/ Signed-off-by: Petr Duda <petrduda(a)seznam.cz> Commit: a4ae932a715582d7abdafae6f8cade4139932101 https://github.com/phpmyadmin/phpmyadmin/commit/a4ae932a715582d7abdafae6f8c… Author: dingo thirteen <dingo13(a)d404.nl> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3334 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/nl/ Signed-off-by: dingo thirteen <dingo13(a)d404.nl>

1 0

[phpmyadmin/phpmyadmin] c3b057: Translated using Weblate (Turkish)
by Burak Yavuz 16 Jun '20

16 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c3b057a6240a0200486a585f4dbc6ba103b98cd5 https://github.com/phpmyadmin/phpmyadmin/commit/c3b057a6240a0200486a585f4db… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3355 of 3355 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit(a)hotmail.com> Commit: aef0408f0cc88259d84ea00d348bca67c6d15fb1 https://github.com/phpmyadmin/phpmyadmin/commit/aef0408f0cc88259d84ea00d348… Author: dingo thirteen <dingo13(a)d404.nl> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3355 of 3355 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nl/ Signed-off-by: dingo thirteen <dingo13(a)d404.nl> Commit: cb5d13fc9c0136dc925c114b0fed1b3a11fcb223 https://github.com/phpmyadmin/phpmyadmin/commit/cb5d13fc9c0136dc925c114b0fe… Author: Olivier Humbert <trebmuh(a)tuxfamily.org> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3355 of 3355 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/ Signed-off-by: Olivier Humbert <trebmuh(a)tuxfamily.org>

1 0

[phpmyadmin/phpmyadmin] 08b79f: Translated using Weblate (Czech)
by Petr Duda 16 Jun '20

16 Jun '20

Branch: refs/heads/QA_4_9 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 08b79ff50e44af281d538c97c75e1fe7d6749698 https://github.com/phpmyadmin/phpmyadmin/commit/08b79ff50e44af281d538c97c75… Author: Petr Duda <petrduda(a)seznam.cz> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 100.0% (3307 of 3307 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/cs/ Signed-off-by: Petr Duda <petrduda(a)seznam.cz> Commit: 0e554225aa8c64426d495b4b489eec5b48b03ef8 https://github.com/phpmyadmin/phpmyadmin/commit/0e554225aa8c64426d495b4b489… Author: dingo thirteen <dingo13(a)d404.nl> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3307 of 3307 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/nl/ Signed-off-by: dingo thirteen <dingo13(a)d404.nl>

1 0

[phpmyadmin/sql-parser] 6fd715: Translated using Weblate (Dutch)
by dingo thirteen 16 Jun '20

16 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 6fd7155cb04a0a033f49494e7ff22ca85e2be220 https://github.com/phpmyadmin/sql-parser/commit/6fd7155cb04a0a033f49494e7ff… Author: dingo thirteen <dingo13(a)d404.nl> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M locale/nl/LC_MESSAGES/sqlparser.mo M locale/nl/LC_MESSAGES/sqlparser.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (50 of 50 strings) [CI skip] Translation: phpMyAdmin/SQL parser Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/sql-parser/nl/ Signed-off-by: dingo thirteen <dingo13(a)d404.nl>

1 0

[phpmyadmin/scripts] 46a557: Build docker edge-5.0
by William Desportes 16 Jun '20

16 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 46a5570d5e63f0fba2230db8d3c89f6b04b1625f https://github.com/phpmyadmin/scripts/commit/46a5570d5e63f0fba2230db8d3c89f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M website/daily-snapshots Log Message: ----------- Build docker edge-5.0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 76447425bcf07abde3689454cfc7b966d1f5f9ee https://github.com/phpmyadmin/scripts/commit/76447425bcf07abde3689454cfc7b9… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M develdocs/build.sh Log Message: ----------- Make BUILDER_ROOT variable in develdocs build script Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 802b49bcf69c70cb1bbcd7cc71fbb2c4b3ea43da https://github.com/phpmyadmin/scripts/commit/802b49bcf69c70cb1bbcd7cc71fbb2… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-16 (Tue, 06 June 2020) +02:00 Changed paths: M develdocs/build.sh Log Message: ----------- Make BUILDER_REPO_NAME variable in develdocs build script Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] 7f3d9d: [pick] (50c9aa6017) Do not use a temp file for PHPCS cache file
by Maurício Meneghini Fauth 15 Jun '20

15 Jun '20

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7f3d9d29db07c316601e0dc309be618881477842 https://github.com/phpmyadmin/phpmyadmin/commit/7f3d9d29db07c316601e0dc309b… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M .gitignore M phpcs.xml.dist Log Message: ----------- [pick] (50c9aa6017) Do not use a temp file for PHPCS cache file Ref: 50c9aa60170ccf3a863e4fb610163a683ae9b18f Note: I cherry-picked this commit because adding only the .gitignore is useless [ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] c24ec4: Translated using Weblate (Czech)
by Petr Duda 15 Jun '20

15 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c24ec492c398f431833606f9d22ec88563a381d8 https://github.com/phpmyadmin/phpmyadmin/commit/c24ec492c398f431833606f9d22… Author: Petr Duda <petrduda(a)seznam.cz> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 100.0% (3355 of 3355 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/cs/ Signed-off-by: Petr Duda <petrduda(a)seznam.cz> Commit: 1113ff26b47d4cbb3d6f6ecb2a5c7aeb0e057868 https://github.com/phpmyadmin/phpmyadmin/commit/1113ff26b47d4cbb3d6f6ecb2a5… Author: Hosted Weblate <hosted(a)weblate.org> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M po/cs.po Log Message: ----------- Merge branch 'origin/master' into Weblate. [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/

1 0

[phpmyadmin/phpmyadmin] 9776ce: Upgrade symfony/* packages
by William Desportes 15 Jun '20

15 Jun '20

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9776ce4a137fe4e7d48b412c93b3cf55565d8765 https://github.com/phpmyadmin/phpmyadmin/commit/9776ce4a137fe4e7d48b412c93b… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Upgrade symfony/* packages Restrictions match versions available in sid: - https://packages.debian.org/fr/sid/php-symfony-config - https://packages.debian.org/fr/sid/php-symfony-dependency-injection - https://packages.debian.org/fr/sid/php-symfony-expression-language - https://packages.debian.org/fr/sid/php-symfony-polyfill-ctype - https://packages.debian.org/fr/sid/php-symfony-polyfill-mbstring Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 65cefd0512353cad97fa001ba3f1b51a47e2b3c1 https://github.com/phpmyadmin/phpmyadmin/commit/65cefd0512353cad97fa001ba3f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Upgrade phpmyadmin/motranslator to 5.0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 1c1d2e4ee7344f7170693ba374d7a32adc140395 https://github.com/phpmyadmin/phpmyadmin/commit/1c1d2e4ee7344f7170693ba374d… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M .travis.yml M composer.json Log Message: ----------- [pick] (f577a71f359) Merge #16031 - Remove codacy/coverage dev-dependency Pull-request: #16031 Ref: #16005 Ref: f577a71f359191582e1605acee7d8705644e001c Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 179ce1cfb7567e10e45450ca68ff686839a2f0e0 https://github.com/phpmyadmin/phpmyadmin/commit/179ce1cfb7567e10e45450ca68f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M po/af.po M po/am.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: e868c74b14def52d2b81fe497851b8e00bb11b3f https://github.com/phpmyadmin/phpmyadmin/commit/e868c74b14def52d2b81fe49785… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Allow twig ^3 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 08dfeefe6029aa992631670abd0b68efb4a30d02 https://github.com/phpmyadmin/phpmyadmin/commit/08dfeefe6029aa992631670abd0… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Allow phpmyadmin/twig-i18n-extension ^3.0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 14211e6118cfc91b34c09b87d4afee80ff29fcc8 https://github.com/phpmyadmin/phpmyadmin/commit/14211e6118cfc91b34c09b87d4a… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M libraries/classes/Controllers/Server/ReplicationController.php M libraries/classes/Controllers/Server/Status/StatusController.php M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M libraries/classes/UserPreferencesHeader.php M test/classes/Display/ErrorTest.php M test/classes/UserPreferencesHeaderTest.php Log Message: ----------- Fix twig imports using old PSR-1 style Ref: https://github.com/twigphp/Twig/commit/273b666a7147afcbb219fb2b7bb4860bb934… Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: f3a46a4e1baff28f1868e07b39918b82bce89370 https://github.com/phpmyadmin/phpmyadmin/commit/f3a46a4e1baff28f1868e07b399… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M templates/columns_definitions/column_virtuality.twig M templates/columns_definitions/partitions.twig M templates/database/designer/main.twig M templates/database/multi_table_query/form.twig M templates/display/export/options_rows.twig M templates/display/import/javascript.twig Log Message: ----------- Remove spaceless from Twig templates Ref: bd33d92f39e7b0ea91aa96a3766207d389483927 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: f7b69495769c57d89d7d344dda38d2980ede5305 https://github.com/phpmyadmin/phpmyadmin/commit/f7b69495769c57d89d7d344dda3… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M scripts/generate-twig-cache Log Message: ----------- Fix generate-twig-cache for Twig 3 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 289fbc129ac2b3a82d15c01c65f48d0ddbd64e83 https://github.com/phpmyadmin/phpmyadmin/commit/289fbc129ac2b3a82d15c01c65f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M composer.json M libraries/classes/Controllers/Server/ReplicationController.php M libraries/classes/Controllers/Server/Status/StatusController.php M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M libraries/classes/UserPreferencesHeader.php M scripts/generate-twig-cache M templates/columns_definitions/column_virtuality.twig M templates/columns_definitions/partitions.twig M templates/database/designer/main.twig M templates/database/multi_table_query/form.twig M templates/display/export/options_rows.twig M templates/display/import/javascript.twig M test/classes/Display/ErrorTest.php M test/classes/UserPreferencesHeaderTest.php Log Message: ----------- Merge #16192 - Support Twig 3 Pull-request: #16192 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 41601a5c6a8e7215db4f7c16eeec4fb19bd47fee https://github.com/phpmyadmin/phpmyadmin/commit/41601a5c6a8e7215db4f7c16eee… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entries for #16192 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 7e5dd8eba0665e46f0120c59df40e1241cd9aab7 https://github.com/phpmyadmin/phpmyadmin/commit/7e5dd8eba0665e46f0120c59df4… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M ChangeLog M composer.json M libraries/classes/Command/CacheWarmupCommand.php M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Html/Generator.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M templates/columns_definitions/column_virtuality.twig M templates/columns_definitions/partitions.twig M templates/database/designer/main.twig M templates/database/multi_table_query/form.twig M templates/display/export/options_rows.twig M templates/display/import/javascript.twig M test/classes/Display/ErrorTest.php Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: dbb18ff274c3e3e09aa86503725cabafe34cb543 https://github.com/phpmyadmin/phpmyadmin/commit/dbb18ff274c3e3e09aa86503725… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M po/af.po M po/am.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/my.po M po/nb.po M po/ne.po M po/nl.po M po/nn.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 1a89fe750c55d91e55011e39bd7d47cf70a970e4 https://github.com/phpmyadmin/phpmyadmin/commit/1a89fe750c55d91e55011e39bd7… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M libraries/classes/Command/CacheWarmupCommand.php M phpstan-baseline.neon M psalm-baseline.xml Log Message: ----------- Update baselines and ignore errors Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: bd4d353d63e3d35c0ce1075f43403473d71252d9 https://github.com/phpmyadmin/phpmyadmin/commit/bd4d353d63e3d35c0ce1075f434… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Html/Generator.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M test/classes/Display/ErrorTest.php Log Message: ----------- Fix coding-standard issues after the merge of #16192 Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/phpmyadmin] e868c7: Allow twig ^3
by William Desportes 15 Jun '20

15 Jun '20

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e868c74b14def52d2b81fe497851b8e00bb11b3f https://github.com/phpmyadmin/phpmyadmin/commit/e868c74b14def52d2b81fe49785… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Allow twig ^3 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 08dfeefe6029aa992631670abd0b68efb4a30d02 https://github.com/phpmyadmin/phpmyadmin/commit/08dfeefe6029aa992631670abd0… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M composer.json Log Message: ----------- Allow phpmyadmin/twig-i18n-extension ^3.0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 14211e6118cfc91b34c09b87d4afee80ff29fcc8 https://github.com/phpmyadmin/phpmyadmin/commit/14211e6118cfc91b34c09b87d4a… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M libraries/classes/Controllers/Server/ReplicationController.php M libraries/classes/Controllers/Server/Status/StatusController.php M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M libraries/classes/UserPreferencesHeader.php M test/classes/Display/ErrorTest.php M test/classes/UserPreferencesHeaderTest.php Log Message: ----------- Fix twig imports using old PSR-1 style Ref: https://github.com/twigphp/Twig/commit/273b666a7147afcbb219fb2b7bb4860bb934… Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: f3a46a4e1baff28f1868e07b39918b82bce89370 https://github.com/phpmyadmin/phpmyadmin/commit/f3a46a4e1baff28f1868e07b399… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M templates/columns_definitions/column_virtuality.twig M templates/columns_definitions/partitions.twig M templates/database/designer/main.twig M templates/database/multi_table_query/form.twig M templates/display/export/options_rows.twig M templates/display/import/javascript.twig Log Message: ----------- Remove spaceless from Twig templates Ref: bd33d92f39e7b0ea91aa96a3766207d389483927 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: f7b69495769c57d89d7d344dda38d2980ede5305 https://github.com/phpmyadmin/phpmyadmin/commit/f7b69495769c57d89d7d344dda3… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-14 (Sun, 06 June 2020) +02:00 Changed paths: M scripts/generate-twig-cache Log Message: ----------- Fix generate-twig-cache for Twig 3 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 289fbc129ac2b3a82d15c01c65f48d0ddbd64e83 https://github.com/phpmyadmin/phpmyadmin/commit/289fbc129ac2b3a82d15c01c65f… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M composer.json M libraries/classes/Controllers/Server/ReplicationController.php M libraries/classes/Controllers/Server/Status/StatusController.php M libraries/classes/Display/Error.php M libraries/classes/Display/Export.php M libraries/classes/Plugins/TwoFactor/Key.php M libraries/classes/Template.php M libraries/classes/Twig/I18n/TokenParserTrans.php M libraries/classes/UserPreferencesHeader.php M scripts/generate-twig-cache M templates/columns_definitions/column_virtuality.twig M templates/columns_definitions/partitions.twig M templates/database/designer/main.twig M templates/database/multi_table_query/form.twig M templates/display/export/options_rows.twig M templates/display/import/javascript.twig M test/classes/Display/ErrorTest.php M test/classes/UserPreferencesHeaderTest.php Log Message: ----------- Merge #16192 - Support Twig 3 Pull-request: #16192 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 41601a5c6a8e7215db4f7c16eeec4fb19bd47fee https://github.com/phpmyadmin/phpmyadmin/commit/41601a5c6a8e7215db4f7c16eee… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-06-15 (Mon, 06 June 2020) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entries for #16192 Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0