aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11741] Fix empty brackets and remove bulletOliver Schramm2013-07-241-2/+2
| | | | PHPBB3-11741
* Merge remote-tracking branch 'EXreaction/ticket/11667' into developAndreas Fischer2013-07-244-9/+37
|\ | | | | | | | | | | | | | | * EXreaction/ticket/11667: [ticket/11667] Use @inheritdoc [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11667] Make functions abstract in includeasset [ticket/11667] includeasset should be abstract
| * [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | | | | | PHPBB3-11667
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23465-2533/+9519
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (224) and others # Via Andreas Fischer (23) and others * 'develop' of github.com:phpbb/phpbb3: (385 commits) [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php [ticket/11731] Remove static calls to captcha garbage collector [ticket/11728] Replace topic_approved with topic_visibility [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case ...
| | * Merge pull request #1601 from nickvergessen/ticket/11734Nathan Guse2013-07-231-0/+11
| | |\ | |/ / |/| | [ticket/11734] Readd accidently removed language strings of forum permissions
| | * [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
| | | | | | | | | | | | PHPBB3-11734
* | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-233-5/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * | | [ticket/11718] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| | | | | | | | | | | | | | | | PHPBB3-11718
| * | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| | | | | | | | | | | | | | | | PHPBB3-11718
* | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11620: (46 commits) [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case [ticket/11615] Refactored isvalid test to be more imperative [ticket/11615] Rename continue -> check_isvalid for clarity [ticket/11620] Added a test for checking if users are banned [ticket/11620] Remove typo in beginning of session_key_test [ticket/11620] Typo in file name session_key_tests -> test ...
| * | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| | | | | | | | | | | | | | | | PHPBB3-11620
| * | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| | | | | | | | | | | | | | | | PHPBB3-11620
| * | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11620
| * | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| | | | | | | | | | | | | | | | PHPBB3-11620
| * | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-225-8/+12
| |\ \ \
| * | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-22498-5058/+11718
| |\ \ \ \
| * | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Fix a static calls to non-static for session captchaasperous2013-07-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes fixes an error in certain version of php that throws an error if you call a non-static method statically. PHPBB3-11620
| * | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Fixed a typo on check_ban_testasperous2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_caseasperous2013-07-221-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the continue->isvalid refactoring is now in a branch with the session_test_case framework, this test can be refactored to use that framework. PHPBB3-11620
| * | | | | [ticket/11615] Refactored isvalid test to be more imperativeAndy Chase2013-07-222-85/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring the continue/is_valid test to remove the confusing data provider work around, while still keeping redundancies down to a minimum. PHPBB3-11615
| * | | | | [ticket/11615] Rename continue -> check_isvalid for clarityAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11615
| * | | | | [ticket/11620] Added a test for checking if users are bannedasperous2013-07-223-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Remove typo in beginning of session_key_testasperous2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Typo in file name session_key_tests -> testasperous2013-07-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added a session key reset testasperous2013-07-221-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added manual key testasperous2013-07-222-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Cherry-Pick merge tests from session-storage-cacheAndy Chase2013-07-222-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Abstracted session setUp into a test_case classasperous2013-07-225-56/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When defining a database test case with a setUp function, it is important to call the parent's setup function, because that is when the database is setup. PHPBB3-11620
| * | | | | [ticket/11620] Removed unnecessary lines and whitespaceAndy Chase2013-07-092-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Rename provider -> mock_auth_providerAndy Chase2013-07-082-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the class and file name to better match what the class is mocking, as well as implement the interface of that class. PHPBB3-11620
| * | | | | [ticket/11620] Minor changes to tests for coding standardsAndy Chase2013-07-084-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] More mock provider methodsAndy Chase2013-07-081-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock provider object now better matches the interface given for providers. PHPBB3-11620
| * | | | | [ticket/11620] Added validate_session to provider.Andy Chase2013-07-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Implemented a provider mock object.Andy Chase2013-07-052-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11620] Reworked create_test without data providerAndy Chase2013-07-051-42/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Add create_test with test for bot detectionAndy Chase2013-07-052-10/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test for the creation of a session with a simple test for detecting whether a bot is present. PHPBB3-11620
| * | | | | [ticket/11620] Fix typo and confusingly named testAndy Chase2013-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Add indentation, change quote style.Andy Chase2013-07-051-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indentation is probably more important than 80 characters per line apparently. Single quotes instead of double per coding guidelines. PHPBB3-11620
| * | | | | [ticket/11620] Add validate_referrer testAndy Chase2013-07-052-1/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test for the validate_referrer function. PHPBB3-11620
| * | | | | [ticket/11620] Remove unneeded functions from testable facadeAndy Chase2013-07-051-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are functions listed in testable facade that don't have a lot of dependencies, instead mostly just take the input and perform database functions on them. These can be tested without a testable facade function and so will be removed. PHPBB3-11620
| * | | | | [ticket/11620] Add ipv6 test cases and remove extra arguments.Andy Chase2013-07-051-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Make testable_facade non-static, expand.Andy Chase2013-07-053-25/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the class functions of testable_facade no longer static methods, but a class based one and expand the methods to be filled in, in later commits. PHPBB3-11620