Commit graph

2856 commits

Author SHA1 Message Date
Josh Woody
6739375135 [feature/soft-delete] Add unit tests for the phpbb_visibility class
Add unit tests for the phpbb_visibility class.  Adjust the phpbb_visibility class to pass those unit tests.  The changes are pretty small, actually.

PHPBB3-9657
2012-08-29 17:50:11 +02:00
Fyorl
94c9d70298 [ticket/11045] Opening brace on its own line
PHPBB3-11045
2012-08-28 09:34:01 +01:00
Fyorl
83a5326077 [ticket/11045] Explicitely check for zlib and bz2
PHPBB3-11045
2012-08-28 09:33:40 +01:00
Fyorl
570502e4a3 [ticket/11045] Added tests for file conflicts
PHPBB3-11045
2012-08-28 09:33:31 +01:00
Fyorl
012c281743 [ticket/11045] Added unit tests for the compress class
PHPBB3-11045
2012-08-28 09:33:19 +01:00
Igor Wiedler
ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (259 commits)
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.
  [feature/php-events] Fix doc of core.viewonline_overwrite_location
  [feature/php-events] Fix doc of core.user_set_default_group
  [feature/php-events] Fix doc of core.generate_smilies_after
  [feature/php-events] Fix doc of core.delete_user_after
  [feature/php-events] Fix doc of core.delete_user_before
  [feature/php-events] Fix doc of core.update_username
  [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
  [feature/php-events] Fix doc and position of viewonline_overwrite_location
  [feature/php-events] Fix doc of core.viewtopic_get_post_data
  [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
  [ticket/11061] Add the --dev flag to the composer instructions in README
  [ticket/11060] Make sure pyrus can install everything on travis
  [ticket/11059] Use https for the README logo
  [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
  [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
  [ticket/11032] fix language of error displayed
  [ticket/11052] update search backend constructor everywhere
  [ticket/11052] pass parametes to search construct while posting
  [ticket/11054] Fixed $config var description
  ...

Conflicts:
	phpBB/includes/cron/task/core/tidy_cache.php
	phpBB/includes/cron/task/core/tidy_search.php
2012-08-25 17:00:40 +02:00
David King
008cf967ab [feature/add_events] Re-fix broken test
PHPBB3-9550
2012-08-21 11:18:53 -04:00
Joas Schilling
d828ef93f2 [ticket/10714] Fix unit test because of events and moved files
PHPBB3-10714
2012-08-21 16:36:32 +02:00
Joas Schilling
3170845a50 [ticket/10714] Refactor disable mechanism to only disable certain types
Only disable admin log when adding multiple users, so critical errors are still
logged.

PHPBB3-10714
2012-08-21 12:12:41 +02:00
Joas Schilling
1e00c697b7 [ticket/10714] Add docblock for the test cases
PHPBB3-10714
2012-08-21 12:12:39 +02:00
Joas Schilling
920cb1a0de [ticket/10714] Add unit tests for view_log function
PHPBB3-10714
2012-08-21 11:59:34 +02:00
Joas Schilling
ea652f0ec9 [ticket/10714] Rename add_log_function test
PHPBB3-10714
2012-08-21 11:59:33 +02:00
Joas Schilling
31e18f31a6 [ticket/10714] Serialize the log_data in the testinsteadof hardcoding it
PHPBB3-10714
2012-08-21 11:59:29 +02:00
Joas Schilling
72d875ebde [ticket/10714] Add unit tests for log class
PHPBB3-10714
2012-08-21 11:59:28 +02:00
Joas Schilling
7e80e4004e [ticket/10714] Add unit tests for add_log function
PHPBB3-10714
2012-08-21 11:59:28 +02:00
David King
efe9b1010a [feature/add_events] Fix append_sid() test
PHPBB3-9550
2012-08-20 21:22:29 -04:00
Fyorl
aa5f6dffa5 [ticket/10939] Added tests for phpbb_request::file
PHPBB3-10939
2012-08-20 21:41:19 +01:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Fyorl
df86f466e0 [ticket/10939] Modified fileupload tests to deal with new behaviour
PHPBB3-10939
2012-08-15 15:56:43 +01:00
Fyorl
348554cc29 [ticket/10939] Modified mock request class to handle deactivated $_FILES
PHPBB3-10939
2012-08-15 15:36:41 +01:00
Fyorl
48a0810ea5 [ticket/10939] Modified request test slightly to include $_FILES
PHPBB3-10939
2012-08-15 14:21:19 +01:00
Nils Adermann
dca9057559 Merge pull request #932 from EXreaction/ticket/10875
Ticket/10875
2012-08-14 02:30:49 -07:00
Joas Schilling
815e8ef9e1 [feature/php-events] Add mock for unit tests and create it were needed
PHPBB3-9550
2012-08-11 15:25:14 +02:00
Nathan Guse
4b7cdd4264 [ticket/10875] Fix cache test
Check for the correct filename based on the way the cache driver creates it

PHPBB3-10875
2012-08-06 18:43:46 -05:00
Nathan Guse
1db91af000 [ticket/10875] Break queries onto separate lines and use double quotes
Coding guidelines

PHPBB3-10875
2012-08-06 16:28:56 -05:00
Nathan Guse
44e48817c3 [ticket/10875] Close $db connection at end of test
Fixes a pgSQL issue

PHPBB3-10875
2012-08-06 16:26:55 -05:00
Nathan Guse
b64ac12bd5 [ticket/10875] Use fixtures for sql cache test
PHPBB3-10875
2012-08-06 16:26:55 -05:00
Nathan Guse
dcefa16318 [ticket/10875] Return $query_id from sql_save
Have to return the $query_id from sql_save so that the results can be pulled

Updated cache test to do some basic sql cache testing.

PHPBB3-10875
2012-08-06 16:26:55 -05:00
Andreas Fischer
17681c0770 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11034] Re-arranged install order to emulate real install
2012-07-30 19:03:20 +02:00
Fyorl
647d395908 [ticket/11034] Re-arranged install order to emulate real install
PHPBB3-11034
2012-07-30 14:13:28 +01:00
Igor Wiedler
cec4c94f2e Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (39 commits)
  [ticket/11025] Add underline for hover to classes
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
  [ticket/11025] Make last topic titles in forum list Bold
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
  [ticket/10990] Changes for develop
  [ticket/10990] Do not use comma separator when storing it as a log.
  [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
  [ticket/11008] Change onunload_functions to not use eval()
  ...
2012-07-26 16:12:21 +02:00
Nils Adermann
da8d610011 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:46 +02:00
Igor Wiedler
6ed63088fe [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-22 01:45:30 +02:00
Igor Wiedler
d6cca4e2c0 [ticket/11015] Fix connection manager db driver selection
PHPBB3-11015
2012-07-21 19:35:39 +02:00
Igor Wiedler
28c3ac2408 [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-21 19:28:55 +02:00
Igor Wiedler
83bdf3eeb3 Merge branch 'develop' into ticket/11015
* develop:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options

Conflicts:
	phpBB/includes/extension/manager.php
2012-07-21 18:21:08 +02:00
Igor Wiedler
90a957ad26 [ticket/11015] Make DBAL classes autoloadable
PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
2012-07-21 18:11:14 +02:00
Igor Wiedler
87b278bda7 [ticket/11012] Fix php_ext change in mock_extension_manager
PHPBB3-11012
2012-07-21 16:31:26 +02:00
Nils Adermann
f7f78adeb9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:42 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:32 +02:00
Igor Wiedler
5d57caee58 Merge branch 'develop' into feature/dic
* develop: (441 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...

Conflicts:
	phpBB/common.php
	phpBB/composer.json
	phpBB/composer.lock
	tests/cron/task_provider_test.php
2012-07-21 15:36:25 +02:00
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Joas Schilling
a9c091fad4 [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
2012-07-20 17:08:54 +02:00
Nils Adermann
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
Andreas Fischer
415a8c6786 Merge remote-tracking branch 'Fyorl/ticket/10992' into develop
* Fyorl/ticket/10992:
  [ticket/10992] Changed octetstream to octet-stream
  [ticket/10992] test_empty_file() now tries to upload the correct file
  [ticket/10992] Modified upload tests to work with new version
2012-07-19 17:08:38 +02:00
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
2012-07-19 16:59:45 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
2012-07-19 16:40:33 +02:00
Joas Schilling
f3bd113d06 [feature/new-tz-handling] Fix unit test
PHPBB3-9558
2012-07-18 17:16:34 +02:00
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass
PHPBB3-10981
2012-07-17 21:39:48 +01:00