1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

74 Commits

Author SHA1 Message Date
Andy Chase
5cdcb689df [ticket/11620] Implemented a provider mock object.
Due to an auth_refactor, there is a new dependency
in session.php on phpbb_container and a provider.

For purposes of testing, implemented a simple one.

PHPBB3-11620
2013-07-05 14:49:30 -07:00
Andreas Fischer
b4183eda0c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()

Conflicts:
	tests/mock/cache.php
2013-06-11 18:46:30 +02:00
Joas Schilling
d406dd99d8 [ticket/develop/11543] Use plurals in develop
PHPBB3-11543
2013-06-06 23:29:50 +02:00
Marc Alexander
3f657bc63e [ticket/11579] Add remaining unit tests for validate_data functions
This now includes tests for usernames, passwords, emails, and jabber
addresses. A few small changes had to be applied to phpbb_mock_cache
and phpbb_mock_user in order to incorporate needed methods.

PHPBB3-11579
2013-05-30 16:05:19 +02:00
David King
fedd9d18d2 Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* EXreaction/ticket/11413: (23 commits)
  [ticket/11413] Revert some cache service related changes from earlier
  [ticket/11413] Use phpbb_user in test
  [ticket/11413] $user should have been $this->user
  [ticket/11413] Fix unit tests
  [ticket/11413] Translate the error
  [ticket/11413] Rename file to something more helpful
  [ticket/11413] Remove remaining irrelevant code to this PR
  [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
  [ticket/11413] Remove conversion of user_notifications
  [ticket/11413] Correct copyright year
  [ticket/11413] Remove changes for ticket 11420 from this branch
  [ticket/11413] Include mock class
  [ticket/11413] Don't use the database for the convert test
  [ticket/11413] Test get_notification_type_id and _ids functions
  [ticket/11413] Use sql_insert_buffer
  [ticket/11413] Create test for notification conversion
  [ticket/11413] Fix test fixtures and tests
  [ticket/11413] Fix some more tests
  [ticket/11413] Fix notification tests
  [ticket/11413] Prevent recursive function calls
  ...
2013-05-20 11:54:39 -04:00
Joas Schilling
65c407044e [ticket/11450] Move mocked class into mock/metadata_manager.php
PHPBB3-11450
2013-05-08 08:47:26 +02:00
Nathaniel Guse
77147b53c1 [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
PHPBB3-11413
2013-05-03 08:38:00 -05:00
Nathaniel Guse
9004676810 [ticket/11413] Include mock class
PHPBB3-11413
2013-04-30 22:02:10 -05:00
Nathaniel Guse
4cd0914f89 [ticket/11413] Fix notification tests
Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413
2013-04-29 22:16:46 -05:00
Nathan Guse
df518ac131 [ticket/11335] (tests) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:45:51 -05:00
Joas Schilling
423b310e2a [ticket/11362] Extension manager depends on filesystem
PHPBB3-11362
2013-04-17 18:43:19 +02:00
Nathan Guse
07282a30ae [ticket/11103] Fix some various issues, better comments
PHPBB3-11103
2013-01-15 12:10:07 -06:00
Nathan Guse
51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
  [ticket/11313] Use correct object el instead of eel in alt_text callback
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
  [ticket/10949] Remove not needed comma
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/11302] Correctly select first timezone or selected timezone
  [ticket/11305] Mock container for cache driver in functional create_user()
  [ticket/11305] Check for $cache being null before using it in db drivers.
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/11305] Define hook finder as a service on the container.
  [ticket/11305] Adjust comment.
  [ticket/11305] Use phpbb_create_default_container.
  [ticket/11305] Create a normal container during final installation step.
  [ticket/11305] Retrieve cache driver from container rather than cache service.
  ...

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
	phpBB/styles/subsilver2/template/overall_footer.html
2013-01-15 11:31:39 -06:00
Oleg Pudeyev
e50f69187f [ticket/11037] Eliminate global $db usage in cache drivers.
The only time $db is needed in cache drivers is to navigate the
result set in sql_save. Pass it as a parameter in that function.

PHPBB3-11037
2012-12-20 04:35:30 -05:00
Marc Alexander
54d96dfac7 [ticket/10763] Make functions for remote avatars static
fileupload::image_types() and filespec::get_extension() are called
statically while submitting the form for the remote avatar. Make them
static as described in the ticket in order to prevent a PHP notice.
Also change the tests to use the static functions.

PHPBB3-10763
2012-12-17 17:42:13 +01:00
Nathaniel Guse
7ae5b62fc6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-12-12 16:30:50 -06:00
David King
a9db155c28 Merge remote-tracking branch 'p/feature/template-events' into develop
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  [feature/template-events] Use style names array in template filter.
  [feature/template-events] Generate style names array in set_style.
  [feature/template-events] Convert a single style name to array of them.
  [feature/template-events] Chase dependency injection for template context.
  [feature/template-events] Adjust template events test to use the dataset.
  [feature/template-events] Create a dataset for template event tests.
  [feature/template-events] Indentation fix.
  [feature/template-events] Cosmetic changes.
  [feature/template-events] Wording: wrongly -> improperly.
  [feature/template-events] Indentation fix.
  [feature/template-events] Rename template_name to style_name.
  ...
2012-12-10 14:09:10 -05:00
Oleg Pudeyev
eaa0319867 Merge PR #1125 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users

Conflicts:
	tests/mock/cache.php
	tests/test_framework/phpbb_functional_test_case.php
2012-12-10 06:25:51 -05:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
Oleg Pudeyev
1285bdff00 [ticket/10972] Add destroy method to mock cache.
I actually needed the version that destroys tables, therefore
I ended up writing a mock null cache. This code is currently unused
but will probably be handy at some point.

PHPBB3-10972
2012-12-06 23:42:13 -05:00
Oleg Pudeyev
771bb957ab [ticket/10972] Add mock null cache.
The mock cache has instrumentation methods and therefore is non-trivial
to implement. For those times when we don't care that the cache caches,
null cache is a simpler implementation.

PHPBB3-10972
2012-12-06 23:41:02 -05:00
Oleg Pudeyev
3a702084e4 Merge PR #974 branch 'bantu/ticket/10875' into develop
* bantu/ticket/10875:
  [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
  [ticket/10875] Test for null cache driver and sql cache.
  [ticket/10875] Revise sql cache test.
  [ticket/10875] Must return query result on failure.
  [ticket/10875] More documentation.
  [ticket/10875] Spelling fix.
  [ticket/10875] Add docblocks for phpbb_cache_driver_interface
  [ticket/10875] Add comment about cache's sql_load() method.
  [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
  [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
  [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
  [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
2012-11-30 20:44:51 -05:00
Oleg Pudeyev
29f7e729ed [feature/template-events] Order extensions in mock extension manager.
PHPBB3-9550
2012-11-27 11:11:50 -05:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Oleg Pudeyev
0e6d12dfc4 [feature/template-events] Allow dataset to be correctly selectable.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
2012-11-14 11:33:24 -06: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
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06: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
David King
f48709f5bb [feature/compiled-dic] Compile the DI Container into a cached class
PHPBB3-11152
2012-11-10 11:40:09 +01:00
Andreas Fischer
59af4d68fc [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
PHPBB3-10875
2012-10-30 18:50:26 -04:00
Nathan Guse
e549b7663d [ticket/11103] Set basic notifications to be enabled by default
Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
2012-10-29 18:09:20 -05:00
Nathan Guse
bc18e368c3 [ticket/11103] Correct the test case
Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
2012-10-20 21:55:58 -05:00
Nathan Guse
c7c3ab07c6 [ticket/11103] Brackets on their own lines
PHPBB3-11103
2012-10-18 19:24:08 -05:00
Nathan Guse
a57f207d68 [ticket/11103] More extensive notification tests
PHPBB3-11103
2012-10-05 15:09:29 -05:00
Nathan Guse
33371effc4 [ticket/11103] Mock notification manager
Fixing delete_user_pms_test.php

PHPBB3-11103
2012-10-04 15:28:51 -05:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Fyorl
348554cc29 [ticket/10939] Modified mock request class to handle deactivated $_FILES
PHPBB3-10939
2012-08-15 15:36:41 +01: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
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
Igor Wiedler
87b278bda7 [ticket/11012] Fix php_ext change in mock_extension_manager
PHPBB3-11012
2012-07-21 16:31:26 +02:00
Fyorl
d89af53f63 [ticket/10941] Added some comments for clarification
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
dfef80f267 [ticket/10941] Unit tests for fileupload class added
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Fyorl
fe4056c599 [ticket/10941] Finished filespec tests
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Fyorl
33a13002af [ticket/10941] Unit tests for filespec class
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Nils Adermann
527f02bb4b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

Conflicts:
	tests/bbcode/url_bbcode_test.php
2012-07-08 23:10:42 +02:00
Andreas Fischer
cde5411e8a [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
PHPBB3-10974
2012-07-08 22:46:14 +02:00
Igor Wiedler
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
2012-03-31 18:14:07 +02:00
Unknown
66c50f6b30 [ticket/9916] Updating license in non-distributed files
PHPBB3-9916
2012-01-02 19:10:36 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00