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

52 Commits

Author SHA1 Message Date
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
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
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
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
Unknown
17991823ea [ticket/9916] Updating License in the header
PHPBB3-9916
2012-01-02 16:18:32 +00:00
Nils Adermann
724f40f0f4 [feature/extension-manager] extension finder now saves ext it found a file in
PHPBB3-10323
2011-10-13 21:19:35 +02:00
Nils Adermann
64827a6623 [feature/extension-manager] Test creation of new extension finder cache
PHPBB3-10323
2011-09-29 15:42:48 +02:00
Nils Adermann
fabde989a2 [feature/extension-manager] Porting cron tasks over to the extension finder
PHPBB3-10323
2011-09-29 15:42:33 +02:00
Nils Adermann
14f1e581fa [feature/extension-manager] Extension Manager & Finder
Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499
Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323

PHPBB3-10323
2011-09-29 15:42:33 +02:00
Igor Wiedler
3048fcf4b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10240] Added optionset to mock_user in the tests.
  [ticket/10240] Fixed copyright year in censor_text_test.php.
  [ticket/10240] Fixed censor_text test assetEquals param order.
  [ticket/10240] Added censor_text tests for special characters.
  [ticket/10240] Added censor_text tests.

Conflicts:
	tests/mock/cache.php
2011-09-05 09:14:06 +02:00
Callum Macrae
fa5c7f6440 [ticket/10240] Added censor_text tests.
PHPBB-10240
2011-08-22 19:02:27 +01:00
Igor Wiedler
fd08cd8dd0 [feature/request-class] Remove $html_encode arg, force manual decoding
PHPBB3-9716
2011-08-18 23:19:48 +02:00
Igor Wiedler
a48889fed8 [feature/request-class] Add is_secure method to request for HTTPS
PHPBB3-9716
2011-08-18 22:26:30 +02:00
Igor Wiedler
76aa24e6b7 [feature/request-class] Minor spacing CS adjustments
PHPBB3-9716
2011-07-16 14:59:52 +02:00
Igor Wiedler
0bf6966c52 [feature/request-class] Add server(), header() and is_ajax() to request
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.

Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.

PHPBB3-9716
2011-07-15 22:34:24 +02:00
Andreas Fischer
7a39bdef89 [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
PHPBB3-10088
2011-03-12 15:26:09 +01:00
Nils Adermann
7255ef4f6d [task/session-tests] By default the cache check now skips over db server info
PHPBB3-9732
2011-02-27 22:17:03 +01:00
Nils Adermann
11262afa93 [ticket/10052] Correct session tests, and separate session factory from tests
PHPBB3-10052
2011-02-23 18:33:20 +01:00
Oleg Pudeyev
0cf741f343 [ticket/10049] Fixed requires in session tests and mock.
PHPBB3-10049
2011-02-19 20:40:32 -05:00
Nils Adermann
74f537e89d [task/session-tests] Added tests for the session class.
Two first simple tests to check functionality of session_begin and
session_create.

Added a mock class for the cache as well as a subclass of session
which has its cookie handling function mocked out to avoid header
sending problems.

PHPBB3-9732
2011-01-20 22:47:48 +01:00
Igor Wiedler
d319fe1883 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
2011-03-12 18:23:47 +01:00
Igor Wiedler
5913aef58f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/session-tests] Make result check independent of returned row order.
  [task/session-tests] By default the cache check now skips over db server info
  [task/session-tests] Correctly display message on session continue test failure
  [task/session-tests] Make the session id replacement of dataset values clearer

Conflicts:
	tests/mock/cache.php
2011-02-27 22:52:56 +01:00
Nils Adermann
aae3bd0c72 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10052] Add comments to the session testable factory.
  [ticket/10052] Correct session tests, and separate session factory from tests
2011-02-24 01:12:53 +01:00
Andreas Fischer
a89be371e8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10049] Mark session init test incomplete for now.
  [ticket/10049] Mark session continue test incomplete for now.
  [ticket/10049] Globalize $_SID.
  [ticket/10049] Chase assertResultEquals rename.
  [ticket/10049] Fixed requires in session tests and mock.
  [ticket/10049] Renamed session test files to proper file names.
2011-02-20 18:33:59 +01:00
Joas Schilling
9846d806f3 [ticket/9823] Move mock file into the mock/ folder.
PHPBB3-9823
2011-02-01 14:54:29 +01:00
Nils Adermann
10169d1c3e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.

Conflicts:
	tests/mock/cache.php
2011-01-23 18:44:03 +01:00