[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e868c7: Allow twig ^3

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>