Build #1,021

Plan branch:

Build: #1021 was successful Changes by Marc

Code commits

phpBB Master

  • Marc

    Marc a5d36816199b9579717ea7486256e5517c6dbc3f

    Merge branch '3.3.x'

  • Marc

    Marc 62a8741494597109ed795b9ab8cf1bb9983d2e94 m

    Merge pull request #6303 from marc1706/ticket/13508
    [ticket/13508] Add tests for INCLUDEJS & INCLUDECSS with twig syntax

  • Marc

    Marc 4d966d17623c080ceec395644e5a898c457f4c2a m

    [ticket/13508] Rename test files to fit in with current naming
    PHPBB3-13508

    • tests/template/template_includecss_test.php (version 4d966d17623c080ceec395644e5a898c457f4c2a)
    • tests/template/template_includejs_test.php (version 4d966d17623c080ceec395644e5a898c457f4c2a)
    • tests/template/templates/include_css.html (version 4d966d17623c080ceec395644e5a898c457f4c2a)
    • tests/template/templates/include_js.html (version 4d966d17623c080ceec395644e5a898c457f4c2a)
    • tests/template/templates/includecss_twig.html (version 4d966d17623c080ceec395644e5a898c457f4c2a)
    • tests/template/templates/includejs_twig.html (version 4d966d17623c080ceec395644e5a898c457f4c2a)
  • Marc

    Marc 056fb494b10098804c1bcbf533841ea5b28d55b0 m

    [ticket/13508] Switch back to current include format
    PHPBB3-13508

    • phpBB/phpbb/template/twig/extension.php (version 056fb494b10098804c1bcbf533841ea5b28d55b0)
    • phpBB/phpbb/template/twig/tokenparser/include_css.php (version 056fb494b10098804c1bcbf533841ea5b28d55b0)
    • phpBB/phpbb/template/twig/tokenparser/include_js.php (version 056fb494b10098804c1bcbf533841ea5b28d55b0)
    • tests/template/templates/include_css.html (version 056fb494b10098804c1bcbf533841ea5b28d55b0)
    • tests/template/templates/include_js.html (version 056fb494b10098804c1bcbf533841ea5b28d55b0)
  • Marc

    Marc 97034e07769867905538260ded062401bf379e2c m

    [ticket/13508] Add tests for include_js() and include_css() twig tokens
    PHPBB3-13508

    • tests/template/template_includecss_test.php (version 97034e07769867905538260ded062401bf379e2c)
    • tests/template/template_includejs_test.php (version 97034e07769867905538260ded062401bf379e2c)
    • tests/template/templates/include_css.html (version 97034e07769867905538260ded062401bf379e2c)
    • tests/template/templates/include_js.html (version 97034e07769867905538260ded062401bf379e2c)
  • Marc

    Marc 02e5a7afc49558b0925378dce825e8f8dae84ddd m

    [ticket/13508] Add include_css() and fix include_js() code linting issues
    PHPBB3-13508

    • phpBB/phpbb/template/twig/extension.php (version 02e5a7afc49558b0925378dce825e8f8dae84ddd)
    • phpBB/phpbb/template/twig/tokenparser/include_css.php (version 02e5a7afc49558b0925378dce825e8f8dae84ddd)
    • phpBB/phpbb/template/twig/tokenparser/include_js.php (version 02e5a7afc49558b0925378dce825e8f8dae84ddd)
    • tests/template/templates/include_css.html (version 02e5a7afc49558b0925378dce825e8f8dae84ddd)
    • tests/template/templates/include_js.html (version 02e5a7afc49558b0925378dce825e8f8dae84ddd)
  • Marc

    Marc 7efddcef5411c4dd386f9dbcb3c117a15093a36f m

    [ticket/13508] Add include_js twig tag as replacement for INCLUDEJS
    PHPBB3-13508

    • phpBB/phpbb/template/twig/extension.php (version 7efddcef5411c4dd386f9dbcb3c117a15093a36f)
    • phpBB/phpbb/template/twig/tokenparser/include_js.php (version 7efddcef5411c4dd386f9dbcb3c117a15093a36f)