aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12620] Fix functional testsTristan Darricau2014-11-201-1/+1
| | | | PHPBB3-12620
* [ticket/12620] Rename productive to productionTristan Darricau2014-11-204-3/+3
| | | | PHPBB3-12620
* [ticket/12620] Fix functional testsTristan Darricau2014-11-202-0/+2
| | | | PHPBB3-12620
* [ticket/12620] Improve error messageTristan Darricau2014-11-201-1/+1
| | | | PHPBB3-12620
* [ticket/12620] Rename debug to developmentTristan Darricau2014-11-202-1/+1
| | | | PHPBB3-12620
* [ticket/12620] Display error message when the environment isn't availableTristan Darricau2014-11-204-3/+22
| | | | PHPBB3-12620
* [ticket/12620] Fix testsTristan Darricau2014-11-201-0/+2
| | | | PHPBB3-12620
* [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-2021-18/+27
| | | | PHPBB3-12620
* Merge pull request #2957 from Nicofuma/ticket/13063Nils Adermann2014-11-2016-239/+594
|\ | | | | [ticket/13063] Introduces a new \phpbb\routing\router class
| * [ticket/13063] Fix functional tests errorsTristan Darricau2014-11-201-1/+0
| | | | | | | | PHPBB3-13063
| * [ticket/13063] Fix coding styleTristan Darricau2014-11-201-5/+4
| | | | | | | | PHPBB3-13063
| * [ticket/13063] Fix tests after rebaseTristan Darricau2014-11-203-19/+18
| | | | | | | | PHPBB3-13063
| * [ticket/13063] Remove kernel_request_subscriber service definitionTristan Darricau2014-11-201-9/+0
| | | | | | | | PHPBB3-13063
| * [ticket/13063] Adds Twig routing extensionTristan Darricau2014-11-204-11/+208
| | | | | | | | PHPBB3-13063
| * [ticket/13063] Introduces a new \phpbb\routing\router classTristan Darricau2014-11-2011-209/+379
|/ | | | PHPBB3-13063
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-2/+6
|\ | | | | | | | | * develop-ascraeus: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| * Merge pull request #3149 from prototech/ticket/13342Tristan Darricau2014-11-181-2/+6
| |\ | | | | | | | | | | | | | | | | | | [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha * prototech/ticket/13342: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| | * [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.Cesar G2014-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix convention as all others. Instead it simply uses phpbb_, hence the check for its existence under phpbb/captcha/plugins/ fails. PHPBB3-13342
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/13315] Check for the includes/captcha/plugins/ directory instead. [ticket/13315] Fix loss of CAPTCHA plugin config value.
| * | Merge pull request #3148 from prototech/ticket/13315Tristan Darricau2014-11-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13315] Fix loss of CAPTCHA plugin config value. * prototech/ticket/13315: [ticket/13315] Check for the includes/captcha/plugins/ directory instead. [ticket/13315] Fix loss of CAPTCHA plugin config value.
| | * | [ticket/13315] Check for the includes/captcha/plugins/ directory instead.Cesar G2014-11-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13315
| | * | [ticket/13315] Fix loss of CAPTCHA plugin config value.Cesar G2014-11-161-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | The plugins were moved to phpbb/captcha/plugins/ after this migration was created, thus the check is no longer valid and ends up resetting the value prematurely. PHPBB3-13315
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3154 from cyberalien/ticket/13349Marc Alexander2014-11-181-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13349] Fix breadcrumb arrow entity
| | * | [ticket/13349] Fix breadcrumb arrow entitycyberalien2014-11-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13349
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-0/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3151 from nickvergessen/ticket/13298Marc Alexander2014-11-181-0/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
| | * | | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13298
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3152 from prototech/ticket/13277Marc Alexander2014-11-181-1/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/13277] Force IE to not cache AJAX requests.
| | * | | [ticket/13277] Force IE to not cache AJAX requests.Cesar G2014-11-181-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Caching causes problems, such as the inability to move a forum/CPF/module in the same direction by more than one row. PHPBB3-13277
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-11-182-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before Conflicts: phpBB/styles/subsilver2/template/posting_buttons.html
| * | | Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeusCesar G2014-11-183-11/+19
| |\ \ \ | | |/ / | |/| | | | | | | | | | * Nicofuma/ticket/13023: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
| | * | [ticket/13023] Add template event posting_editor_buttons_custom_tags_beforeTristan Darricau2014-11-163-11/+19
| | | | | | | | | | | | | | | | PHPBB3-13023
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-1715-14/+24
|\ \ \ \ | |/ / /
| * | | Merge pull request #3145 from bantu/ticket/13338Joas Schilling2014-11-1715-14/+24
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13338] Make all tests run on their own. Avoid _test suffix for abstract test case classes.
| | * | | [ticket/13338] Add include statements for dependencies.Andreas Fischer2014-11-176-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-13338
| | * | | [ticket/13338] Do not use the _test.php suffix for abstract test case classes.Andreas Fischer2014-11-178-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-13338
| | * | | [ticket/13338] Move insert_config_array_test to functions_acp, add deps.Andreas Fischer2014-11-171-0/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-13338
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-171-6/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-170-0/+0
| |\ \ \
| | * \ \ Merge pull request #3146 from bantu/ticket/13341Joas Schilling2014-11-171-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp ...
| * | \ \ \ Merge pull request #3147 from bantu/ticket/13341-ascraeusJoas Schilling2014-11-171-6/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files
| | * | | | Merge pull request #3146 from bantu/ticket/13341Andreas Fischer2014-11-141-6/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp ... * bantu/ticket/13341: [ticket/13341] Change coverage to whitelist to prevent errors with temp files. Conflicts: phpunit.xml.dist
| | | * | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files.Andreas Fischer2014-11-141-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4f95deefc9d456c5a2d0f6338f6dcecc0829652 suggests that this can lead to issues with classes having the same name. However, this does not seem to be a problem with the current version of PHPUnit we are using. Despite https://phpunit.de/manual/4.1/en/code-coverage-analysis.html saying that addUncoveredFilesFromWhitelist="true" is optional, this seems to be on by default in PHPUnit 4.1.0. As a result, all files are considered for code coverage; which is what we want. processUncoveredFilesFromWhitelist is however false (by default) and as such even files that are considered for code coverage are not processed through PHP when not used in actual tests. Since it is already impossible to test multiple classes with the same name in the same test run (without process isolation), because that would already lead to "cannot redeclare class" errors, it is also impossible for "cannot redeclare class" errors to happen in test coverage. PHPBB3-13341
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-1616-147/+164
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| * | | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into ↵Nils Adermann2014-11-1616-147/+164
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/13280: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| | * | | | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-1612-56/+116
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| | * | | | [ticket/13280] Add new testsTristan Darricau2014-11-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| | * | | | [ticket/13280] Make the tests failingTristan Darricau2014-11-124-100/+78
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280