# By Igor Wiedler
# Via Igor Wiedler
* igorw/ticket/11306:
[ticket/11306] Add docblocks to all container related functions
[ticket/11306] Introduce phpbb_create_default_container
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11291] phing: Also add checkreturn="true" to composer execution.
[ticket/11291] phing: Add checkreturn="true" to all new commands.
[ticket/11291] phing: Exclude vendor folder from diffs.
[ticket/11291] phing packaging: Export composer.phar and install dependencies.
[ticket/11291] phing: Remove no longer needed create-package target.
[ticket/11291] phing: The package target does not depend on composer.
[ticket/11291] phing: Adjust directory format of composer exec.
[ticket/11291] phing: Add description for composer target.
[ticket/11291] phing: Add --dev to composer install.
[ticket/11291] phing: Correct dependencies of composer target.
[ticket/11291] phing: Make sure composer is available before calling it.
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
[ticket/11291] phing: Also add checkreturn="true" to composer execution.
[ticket/11291] phing: Add checkreturn="true" to all new commands.
[ticket/11291] phing: Exclude vendor folder from diffs.
[ticket/11291] phing packaging: Export composer.phar and install dependencies.
[ticket/11291] phing: Remove no longer needed create-package target.
[ticket/11291] phing: The package target does not depend on composer.
[ticket/11291] phing: Adjust directory format of composer exec.
[ticket/11291] phing: Add description for composer target.
[ticket/11291] phing: Add --dev to composer install.
[ticket/11291] phing: Correct dependencies of composer target.
[ticket/11291] phing: Make sure composer is available before calling it.
The packaging process does not require running composer in the phpBB tree.
It does however require running composer on the git exports, but this is not
what the composer target does.
PHPBB3-11291
The composer target runs composer in the phpBB tree in order to load
dependencies for testing. The testing framework may have additional
development dependencies (e.g. goutte). We also have to load those.
PHPBB3-11291
This command runs composer in the phpBB tree and does not write to the build
folders. Thus, it does not have to depend on prepare and clean targets.
PHPBB3-11291
* p/ticket/10758:
[ticket/10758] Add return to the other compat function.
[ticket/10758] Add periods.
[ticket/10758] Yes, only one empty line.
[ticket/10758] Add deprecated tags.
[ticket/10758] Add compat functions.
[ticket/10758] Admin is not working yet.
[ticket/10758] Test moderator and admin permissions.
[ticket/10758] Check that acl was changed in the test.
[ticket/10758] Extract obtain_user_data for the benefit of tests.
[ticket/10758] Functional test for changing a user's permission.
[ticket/10758] Spelling fix.
[ticket/10758] Add a test for acp login.
[ticket/10758] Dependency inject parameters into update_foes.
[ticket/10758] Dependency inject parameters into cache_moderators.
* develop-olympus:
[ticket/11278] Comment out the code for dropping the Q&A tables
[ticket/11278] Fix not running queries from db tools in database update
Conflicts:
phpBB/install/database_update.php
* nickvergessen/ticket/11278:
[ticket/11278] Comment out the code for dropping the Q&A tables
[ticket/11278] Fix not running queries from db tools in database update
Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.
If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang
phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid
Again, this needs to be done only if a board was manually modified to fix
broken captcha code.
PHPBB3-11278
