aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11015] Fixup some things from the big mergeIgor Wiedler2012-11-122-3/+2
| | | | PHPBB3-11015
* Merge remote-tracking branch 'upstream/develop' into ticket/11015Igor Wiedler2012-11-125-51/+244
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (31 commits) [ticket/11194] Service tag data is stored in an array so access it correctly [ticket/11193] Instantiate a single collection_pass for all collections [ticket/11152] Basic tests for the container functions [ticket/11152] Compile the install container [ticket/11152] Throw error if services.yml is missing [ticket/11152] Remove old container processor calls [ticket/11152] Use realpath in container extensions consistently [ticket/11152] Rename collection to collection_pass [ticket/11152] Remove @api docblocks [ticket/11152] Create separate function for debug-dependent container [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection [ticket/11152] Convert cron_task_collection to generic di_service_collection [ticket/11152] Use relative root path in container, one dumped container per path [ticket/11152] Move container functions to a separate function file [feature/compiled-dic] Rename $phpEx to $php_ext in new code [feature/compiled-dic] Use an absolute path for core.root_path parameter [feature/compiled-dic] Update the composer.lock file [feature/compiled-dic] Purge cache to make ext services available right away [feature/compiled-dic] Fix root path when container is created after install [feature/compiled-dic] Remove old test ...
| * Merge pull request #1056 from igorw/feature/compiled-dicNils Adermann2012-11-115-51/+244
| |\ | | | | | | [feature/compiled-dic] Compile the DI Container into a cached class
| | * [ticket/11152] Basic tests for the container functionsIgor Wiedler2012-11-112-0/+83
| | | | | | | | | | | | PHPBB3-11152
| | * [feature/compiled-dic] Remove old testDavid King2012-11-101-50/+0
| | | | | | | | | | | | PHPBB3-11152
| | * [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-102-1/+161
| | | | | | | | | | | | PHPBB3-11152
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Igor Wiedler2012-11-1254-58/+1670
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (666 commits) [ticket/11077] Remove code from old global announcements system [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output [ticket/11187] Added a blank array to fix errors in functional tests [ticket/10780] Make L_COLON available in the installer. [ticket/11183] Remove $load_extensions and weird dl() calls [ticket/10970] Added extra documentation to parse_dynamic_path. [ticket/10939] Added documentation for phpbb_request::file [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. ... Conflicts: phpBB/common.php phpBB/download/file.php phpBB/includes/db/dbal.php phpBB/includes/db/firebird.php phpBB/includes/db/mssql.php phpBB/includes/db/mssql_odbc.php phpBB/includes/db/mssqlnative.php phpBB/includes/db/mysql.php phpBB/includes/db/mysqli.php phpBB/includes/db/oracle.php phpBB/includes/db/postgres.php phpBB/includes/db/sqlite.php phpBB/includes/extension/manager.php phpBB/install/database_update.php
| * | Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-103-2/+38
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10939: [ticket/10939] Added documentation for phpbb_request::file [ticket/10939] Added tests for phpbb_request::file [ticket/10939] Modified the default return for $request->file [ticket/10939] Modified fileupload tests to deal with new behaviour [ticket/10939] Modified mock request class to handle deactivated $_FILES [ticket/10939] Modified acp_groups.php to not use $_FILES [ticket/10939] Modified ucp_groups.php to not use $_FILES [ticket/10939] Modified functions_user.php to not use $_FILES [ticket/10939] Modified message_parser.php to not use $_FILES [ticket/10939] Modified functions_upload to not use $_FILES [ticket/10939] Modified request test slightly to include $_FILES [ticket/10939] Added $_FILES handling to phpbb_request
| | * | [ticket/10939] Added tests for phpbb_request::fileFyorl2012-08-201-0/+17
| | | | | | | | | | | | | | | | PHPBB3-10939
| | * | [ticket/10939] Modified fileupload tests to deal with new behaviourFyorl2012-08-151-1/+5
| | | | | | | | | | | | | | | | PHPBB3-10939
| | * | [ticket/10939] Modified mock request class to handle deactivated $_FILESFyorl2012-08-151-1/+8
| | | | | | | | | | | | | | | | PHPBB3-10939
| | * | [ticket/10939] Modified request test slightly to include $_FILESFyorl2012-08-151-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10939
| * | | Merge pull request #881 from Fyorl/ticket/10970Nils Adermann2012-11-109-3/+32
| |\ \ \ | | | | | | | | | | Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
| | * | | [ticket/10970] Added support for forms such as {FOO}bar.{EXT}Fyorl2012-07-082-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10970
| | * | | [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctlyFyorl2012-07-089-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new method to handle this type of path was added and compile_tag_include, compile_tag_include_php and compile_tag_include_js were modified to use it appropriately. Tests were added for these three macros also. PHPBB3-10970
| * | | | Merge remote-tracking branch 'Fyorl/ticket/11187' into developAndreas Fischer2012-11-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11187: [ticket/11187] Added a blank array to fix errors in functional tests
| | * | | | [ticket/11187] Added a blank array to fix errors in functional testsFyorl2012-11-101-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-11187
| * | | | [ticket/11183] Remove $load_extensions and weird dl() callsIgor Wiedler2012-11-101-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-11183
| * | | Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-092-0/+229
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/ticket/11174: [ticket/11174] Check common words, fix array equality assertion. [ticket/11174] Test for common words. [ticket/11174] More tests. [ticket/11174] Clarify why that is the way it is. [ticket/11174] Started on search tests - keyword splitting.
| | * | | [ticket/11174] Check common words, fix array equality assertion.Oleg Pudeyev2012-11-081-11/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| | * | | [ticket/11174] Test for common words.Oleg Pudeyev2012-11-082-0/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| | * | | [ticket/11174] More tests.Oleg Pudeyev2012-11-081-0/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| | * | | [ticket/11174] Clarify why that is the way it is.Oleg Pudeyev2012-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| | * | | [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-082-0/+146
| | | | | | | | | | | | | | | | | | | | PHPBB3-11174
| * | | | [ticket/11159] Static public is the currently approved order.Oleg Pudeyev2012-11-063-3/+3
| |/ / / | | | | | | | | | | | | PHPBB3-11159
| * | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEADNils Adermann2012-11-063-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop-olympus: [ticket/11159] static public is the currently approved order. Conflicts: tests/dbal/select_test.php tests/dbal/write_test.php tests/request/request_var_test.php tests/security/extract_current_page_test.php tests/security/redirect_test.php tests/template/template_test.php tests/text_processing/make_clickable_test.php tests/utf/utf8_clean_string_test.php
| | * | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-11-0610-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11159
| * | | | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-023-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10933
| * | | | [ticket/10933] Specify empty template path for absolute includephp test.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably necessary all along, and the test happened to work because state was not correctly reset between test runs and a previous test set an empty template path. PHPBB3-10933
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10848] Move include up. [ticket/10848] Add phpbb_ prefix. [ticket/10848] Redirect from adm to installer correctly. Conflicts: phpBB/includes/functions.php
| | * | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| | * | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+44
| | | | | | | | | | | | | | | | | | | | PHPBB3-10848
| * | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-101-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| | * | | | [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().Andreas Fischer2012-09-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | [ticket/8713] Use \t in double quotes instead of tabs.Andreas Fischer2012-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | [ticket/8713] Use correct parameter for nested data.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | [ticket/8713] Adjust test method name to other recursive_set_var() tests.Andreas Fischer2012-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
| * | | | | [ticket/11109] Re-add file conflict checks to compress classFyorl2012-09-141-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11109
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-09-1411-0/+166
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11045] Removed file conflict tests for compress class [ticket/11045] Replaced __DIR__ with dirname(__FILE__) [ticket/11045] Opening brace on its own line [ticket/11045] Explicitely check for zlib and bz2 [ticket/11045] Added tests for file conflicts [ticket/11045] Added unit tests for the compress class
| | * | | Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympusAndreas Fischer2012-09-1411-0/+166
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11045: [ticket/11045] Removed file conflict tests for compress class [ticket/11045] Replaced __DIR__ with dirname(__FILE__) [ticket/11045] Opening brace on its own line [ticket/11045] Explicitely check for zlib and bz2 [ticket/11045] Added tests for file conflicts [ticket/11045] Added unit tests for the compress class
| | | * | | [ticket/11045] Removed file conflict tests for compress classFyorl2012-09-111-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | | * | | [ticket/11045] Replaced __DIR__ with dirname(__FILE__)Fyorl2012-09-011-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | | * | | [ticket/11045] Opening brace on its own lineFyorl2012-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | | * | | [ticket/11045] Explicitely check for zlib and bz2Fyorl2012-08-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | | * | | [ticket/11045] Added tests for file conflictsFyorl2012-08-281-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | | * | | [ticket/11045] Added unit tests for the compress classFyorl2012-08-2811-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-0111-31/+175
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
| | * \ \ \ \ Merge pull request #962 from imkingdavid/feature/add_eventsNils Adermann2012-09-011-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Feature/add events
| | | * | | | | [feature/add_events] Re-fix broken testDavid King2012-08-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550