* nickvergessen/ticket/12205:
[ticket/12205] Do not display 0 for empty integers when show_novalue is off
Conflicts:
phpBB/includes/functions_profile_fields.php
The migration helper currently drops any keys with schema changes that have
the data_depth 1. This change will correctly assign the keys to the steps
array without dropping the keys that might contain important info like the
actual table that should be created.
PHPBB3-12170
* github-nickvergessen/ticket/11201: (50 commits)
[ticket/11201] Remove empty calls section from .yml
[ticket/11201] Split template file into multiple files
[ticket/11201] Remove dependency from types on the manager
[ticket/11201] Rename profilefields class to manager
[ticket/11201] Fix parameter description
[ticket/11201] Use !== null, its faster
[ticket/11201] Also translate profile fields in UCP and ACP
[ticket/11201] Add parameters and variables to profile field class
[ticket/11201] Add commas on last array entry
[ticket/11201] Allow translation of profile field name and explanation
[ticket/11201] Fix some variable names
[ticket/11201] Add tables to constructor in tests
[ticket/11201] Add a method to return the translated full name of the type
[ticket/11201] Remove db depending code from field class
[ticket/11201] Add variables to classes and add constructor doc blocks
[ticket/11201] Update copyright in class file
[ticket/11201] Add visibility and remove unused variable
[ticket/11201] Add some commas at the last array entry
[ticket/11201] Cast some variables to integer
[ticket/11201] Inject table names rather then using constants
...
Conflicts:
phpBB/config/services.yml
This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.
PHPBB3-11610
* EXreaction/ticket/12006:
[ticket/12006] global $phpbb_dispatcher;
[ticket/12006] Missing a space
[ticket/12006] Add module_auth event
[ticket/12006] Test for ext module auth
[ticket/12006] Add extension enabled check token to module auth
[ticket/12006] Cleanup the module auth function token replacement code
* Marc/ticket/11997: (23 commits)
[ticket/11997] Use functional test cases that should always work
[ticket/11997] Fix redirect tests for mod rewrite
[ticket/11997] Add user's page dir to redirect path and fix unit tests for it
[ticket/11997] Remove obsolete function get_controller_redirect_url()
[ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
[ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
[ticket/11997] Do not check if file or dir we redirect to exist
[ticket/11997] Modifiy tests after adding path_helper clean_url method
[ticket/11997] Add clean_url() method to path_helper
[ticket/11997] Allow redirects to parent folders like previously
[ticket/11997] Move expected redirect returns to controller and output to HTML
[ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
[ticket/11997] Use get_controller_redirect_url() in redirect() function
[ticket/11997] Add method for controller redirect URLs to path helper
[ticket/11997] Undo changes to phpbb_own_realpath()
[ticket/11997] Remove obsolete failover_flag in function redirect()
[ticket/11997] Add functional test for redirects in controller
[ticket/11997] Fix missing global
[ticket/11997] Fix redirects from inside controllers
[ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
...
The previous test cases that tried to redirect to ../index.php and similar
might cause us to try to go to http://localhost/../index.php, which will
result in http://index.php. As this obviously will trigger an error as
intended, we should not put this inside our test cases for the redirect
function.
PHPBB3-11997