1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

709 Commits

Author SHA1 Message Date
Oleg Pudeyev
109a86520f Merge PR #1060 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:31:03 -05:00
Oleg Pudeyev
17a7c4821a Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympus
* nickvergessen/ticket/11186:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:00:39 -05:00
Andreas Fischer
3408662e16 Merge remote-tracking branch 'p/ticket/11202' into develop
* p/ticket/11202:
  [ticket/11202] Check response success before content assertions.
2012-11-15 21:43:33 +01:00
Oleg Pudeyev
8917b31e31 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 14:54:13 -05:00
Oleg Pudeyev
ec06d5c5d9 [ticket/11204] Reindent.
PHPBB3-11204
2012-11-15 14:52:53 -05:00
Andreas Fischer
b9e1caa81a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-11-15 20:24:37 +01:00
Andreas Fischer
14a42a97a8 Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympus
* p/ticket/11202-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
2012-11-15 19:48:46 +01:00
Oleg Pudeyev
7402520d2f Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into develop
* Fyorl/ticket/11190-develop:
  [ticket/11190-develop] Functional tests purge cache before running.
2012-11-15 09:47:51 -05:00
Oleg Pudeyev
af7ab2d3ac [ticket/11202] Custom message does not make sense here, delete it.
PHPBB3-11202
2012-11-15 08:40:29 -05:00
Oleg Pudeyev
dc61fd1091 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 08:25:14 -05:00
Oleg Pudeyev
4ab178f3ef [ticket/11202] Add a heuristic function to check for response success.
This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
2012-11-15 08:24:27 -05:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
1bf7f0bde7 [ticket/11152] Basic tests for the container functions
PHPBB3-11152
2012-11-11 17:56:09 +01:00
Fyorl
db0cc74af0 [ticket/11190-develop] Functional tests purge cache before running.
PHPBB3-11190
2012-11-11 10:53:44 +00:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Andreas Fischer
e86ecc0f3b Merge remote-tracking branch 'Fyorl/ticket/10939' into develop
* 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
2012-11-10 23:49:29 +01:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Andreas Fischer
3f933c6870 Merge remote-tracking branch 'Fyorl/ticket/11187' into develop
* Fyorl/ticket/11187:
  [ticket/11187] Added a blank array to fix errors in functional tests
2012-11-10 14:58:03 +01:00
Fyorl
c73293d826 [ticket/11187] Added a blank array to fix errors in functional tests
PHPBB3-11187
2012-11-10 13:46:40 +00:00
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
2012-11-10 14:34:52 +01:00
David King
1e3a5dde7d [feature/compiled-dic] Remove old test
PHPBB3-11152
2012-11-10 12:02:55 +01:00
David King
f48709f5bb [feature/compiled-dic] Compile the DI Container into a cached class
PHPBB3-11152
2012-11-10 11:40:09 +01:00
Igor Wiedler
195014867a [ticket/11183] Remove $load_extensions and weird dl() calls
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Nils Adermann
0282fe7024 Merge remote-tracking branch 'github-p/ticket/11174' into develop
* 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.
2012-11-09 12:12:33 +01:00
Oleg Pudeyev
a5f7f99478 [ticket/11174] Check common words, fix array equality assertion.
PHPBB3-11174
2012-11-08 11:15:46 -05:00
Oleg Pudeyev
e523517e03 [ticket/11174] Test for common words.
PHPBB3-11174
2012-11-08 11:01:34 -05:00
Oleg Pudeyev
1aa0b4567f [ticket/11174] More tests.
PHPBB3-11174
2012-11-08 10:23:28 -05:00
Oleg Pudeyev
ed37141f51 [ticket/11174] Clarify why that is the way it is.
PHPBB3-11174
2012-11-08 10:19:15 -05:00
Oleg Pudeyev
18a922c036 [ticket/11174] Started on search tests - keyword splitting.
PHPBB3-11174
2012-11-08 10:14:29 -05:00
Oleg Pudeyev
644662bc2c [ticket/11159] Static public is the currently approved order.
PHPBB3-11159
2012-11-06 16:43:48 -05:00
Nils Adermann
1d388d98ab Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD
* 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
2012-11-06 20:02:40 +01:00
Oleg Pudeyev
a7babc211c [ticket/11159] static public is the currently approved order.
PHPBB3-11159
2012-11-06 10:41:06 -05:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
Oleg Pudeyev
c3fb0f359c [ticket/10933] Specify empty template path for absolute includephp test.
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
2012-11-02 18:06:21 -04:00
Andreas Fischer
4f3f4a40d6 Merge branch 'develop-olympus' into develop
* 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
2012-10-18 16:34:59 +02:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* 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
2012-10-10 00:03:13 -04:00
Fyorl
b24ee89cfc [ticket/11109] Re-add file conflict checks to compress class
PHPBB3-11109
2012-09-14 01:26:33 +02:00
Andreas Fischer
91423880da Merge branch 'develop-olympus' into develop
* 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
2012-09-14 00:49:48 +02:00
Andreas Fischer
888aa47b0e Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus
* 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
2012-09-14 00:46:04 +02:00
Fyorl
ce7cffcf9e [ticket/11045] Removed file conflict tests for compress class
PHPBB3-11045
2012-09-11 09:42:29 +01:00
Andreas Fischer
160c49351b [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
PHPBB3-8713
2012-09-08 13:44:50 +02:00
Andreas Fischer
4550fff55a [ticket/8713] Use \t in double quotes instead of tabs.
PHPBB3-8713
2012-09-08 13:43:14 +02:00
Andreas Fischer
2c41b9062a [ticket/8713] Use correct parameter for nested data.
PHPBB3-8713
2012-09-08 13:41:51 +02:00
Andreas Fischer
06c3868c27 [ticket/8713] Adjust test method name to other recursive_set_var() tests.
PHPBB3-8713
2012-09-08 13:40:28 +02:00
Nathaniel Guse
b3cd5a649b [ticket/8713] Do not trim login inputs
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
2012-09-03 13:32:33 -05:00
Unknown Bliss
79da1ea592 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
2012-09-01 21:15:39 +01:00
Nils Adermann
43190ebeca Merge pull request #962 from imkingdavid/feature/add_events
Feature/add events
2012-09-01 12:44:23 -07:00
Nils Adermann
c539c2b0f9 Merge remote-tracking branch 'github-igorw/feature/dic' into develop
* github-igorw/feature/dic: (35 commits)
  [feature/dic] Spaces to tabs, add useless docblocks
  [feature/dic] Remove unneeded newline
  [feature/dic] Add a doc block for the prune_forum cron task forum_data
  [feature/dic] Update composer.lock to symfony/* RC1
  [feature/dic] Fix re-ordering of services
  [feature/dic] Fix parse errors
  [feature/dic] Add docblock for cron_manager::wrap_task()
  [feature/dic] Make cron task attributes protected, one per line
  [feature/dic] Coding style: Braces
  [feature/dic] Re-order services alphabetically
  [feature/dic] Remove duplicate event-dispatcher dependency
  [feature/dic] Adjust installer script to work with partially configured container
  [feature/dic] Generate full cache driver class name on fresh install
  [feature/dic] Adjust cache driver class name for BC
  [feature/dic] Rename {phpEx => php_ext} for consistency
  [feature/dic] Add trailing newline to htaccess
  [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
  [feature/dic] Load services from extensions
  [feature/dic] Introduce DI processors instead of abusing compiler passes
  [feature/dic] Add dbal_ class prefix to dbal.driver.class
  ...
2012-09-01 19:21:24 +02:00