aboutsummaryrefslogtreecommitdiffstats
path: root/tests/mock
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11015] Fixup some things from the big mergeIgor Wiedler2012-11-121-1/+1
| | | | PHPBB3-11015
* Merge remote-tracking branch 'upstream/develop' into ticket/11015Igor Wiedler2012-11-121-0/+160
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-111-0/+160
| |\ | | | | | | [feature/compiled-dic] Compile the DI Container into a cached class
| | * [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-101-0/+160
| | | | | | | | | | | | PHPBB3-11152
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Igor Wiedler2012-11-122-1/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-1/+8
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Modified mock request class to handle deactivated $_FILESFyorl2012-08-151-1/+8
| | | | | | | | | | | | PHPBB3-10939
| * | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-201-0/+16
| |\ \ | | |/ | |/|
| | * [feature/php-events] Add mock for unit tests and create it were neededJoas Schilling2012-08-111-0/+16
| | | | | | | | | | | | PHPBB3-9550
| * | [ticket/10875] Return $query_id from sql_saveNathan Guse2012-08-061-1/+1
|/ / | | | | | | | | | | | | | | 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
* | [ticket/11012] Fix php_ext change in mock_extension_managerIgor Wiedler2012-07-211-1/+1
|/ | | | PHPBB3-11012
* [ticket/10941] Added some comments for clarificationFyorl2012-07-091-0/+7
| | | | PHPBB3-10941
* [ticket/10941] Unit tests for fileupload class addedFyorl2012-07-081-0/+32
| | | | PHPBB3-10941
* [ticket/10941] Finished filespec testsFyorl2012-07-081-0/+22
| | | | PHPBB3-10941
* [ticket/10941] Unit tests for filespec classFyorl2012-07-081-0/+23
| | | | PHPBB3-10941
* Merge branch 'develop-olympus' into developNils Adermann2012-07-081-0/+36
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php Conflicts: tests/bbcode/url_bbcode_test.php
| * [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.phpAndreas Fischer2012-07-081-0/+36
| | | | | | | | PHPBB3-10974
* | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-311-2/+1
| | | | | | | | PHPBB-10609
* | [ticket/9916] Updating license in non-distributed filesUnknown2012-01-023-3/+3
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-022-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * 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
| * [ticket/9916] Updating License in the headerUnknown2012-01-022-2/+2
| | | | | | | | PHPBB3-9916
* | [feature/extension-manager] extension finder now saves ext it found a file inNils Adermann2011-10-131-3/+6
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Test creation of new extension finder cacheNils Adermann2011-09-291-0/+12
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Porting cron tasks over to the extension finderNils Adermann2011-09-291-1/+3
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Extension Manager & FinderNils Adermann2011-09-291-0/+16
| | | | | | | | | | | | | | Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499 Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323 PHPBB3-10323
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-051-0/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/10240] Added censor_text tests.Callum Macrae2011-08-221-0/+22
| | | | | | | | PHPBB-10240
* | [feature/request-class] Remove $html_encode arg, force manual decodingIgor Wiedler2011-08-181-4/+4
| | | | | | | | PHPBB3-9716
* | [feature/request-class] Add is_secure method to request for HTTPSIgor Wiedler2011-08-181-0/+5
| | | | | | | | PHPBB3-9716
* | [feature/request-class] Minor spacing CS adjustmentsIgor Wiedler2011-07-161-2/+2
| | | | | | | | PHPBB3-9716
* | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-151-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-121-0/+5
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
| * [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.Andreas Fischer2011-03-121-0/+5
| | | | | | | | PHPBB3-10088
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-271-2/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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
| * [task/session-tests] By default the cache check now skips over db server infoNils Adermann2011-02-271-2/+9
| | | | | | | | PHPBB3-9732
* | Merge branch 'develop-olympus' into developNils Adermann2011-02-242-0/+53
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10052] Add comments to the session testable factory. [ticket/10052] Correct session tests, and separate session factory from tests
| * [ticket/10052] Correct session tests, and separate session factory from testsNils Adermann2011-02-231-0/+7
| | | | | | | | PHPBB3-10052
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * 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.
| * [ticket/10049] Fixed requires in session tests and mock.Oleg Pudeyev2011-02-191-2/+2
| | | | | | | | PHPBB3-10049
* | [ticket/9823] Move mock file into the mock/ folder.Joas Schilling2011-02-011-0/+33
| | | | | | | | PHPBB3-9823
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-232-0/+61
|\ \ | |/ | | | | | | | | | | | | | | | | * 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
| * [task/session-tests] Added tests for the session class.Nils Adermann2011-01-202-0/+117
| | | | | | | | | | | 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
* [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-101-0/+6
| | | | | | | | | | | | | | | There is a phpbb_config class which simply holds an array and does not persist any data. It implements ArrayAccess, Countable and IteratorAggregate to allow regular use of configuration as if it was still an array. The phpbb_config_db class depends on an instance of the dbal and a cache driver. It obtains the configuration data from cache and database as necessary and persists data to the database. The functions set_config and set_config_count remain for backward compatability but they only call methods on the new config class now instead of directly manipulating the database and cache. PHPBB3-9988
* [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-091-0/+87
PHPBB3-9983