aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/sphinx-fulltext-search] add docblock and access modifiersDhruv Goel2012-07-121-15/+70
| | | | | | | | PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
* [feature/sphinx-fulltext-search] add class properties indexes & sphinxDhruv Goel2012-07-121-0/+2
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] use keywords_search instead of get_nameDhruv Goel2012-07-121-1/+1
| | | | | | | using keyword_search method instead of get_name to distinguish between the search backend classes present in includes/search and other helper classes. PHPBB3-10946
* [feature/sphinx-fulltext-search] remove unused arraysDhruv Goel2012-07-121-8/+1
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] add sphinx_table constant to constants.phpDhruv Goel2012-07-122-1/+1
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] Make different files for different classesDhruv Goel2012-07-125-239/+280
| | | | | | | | | | | Break the classes in functions-sphinx.php into different files with proper class names according to phpbb class auto loader conventions. PHPBB3-10946 Conflicts: phpBB/includes/search/sphinx/config.php
* [feature/sphinx-fulltext-search] add binlog_path to configDhruv Goel2012-07-122-0/+2
| | | | | | binlog files are now added to the data folder. PHPBB3-10946
* [feature/sphinx-fulltext-search] use sql_build_query for queryDhruv Goel2012-07-121-7/+17
| | | | | | | | | | | Uses sql_build_query for JOIN query. Remove casting to int and space for phpbb conventions to be followed PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
* [feature/sphinx-fulltext-search] remove all reference returnsDhruv Goel2012-07-122-9/+9
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] integrate sphinx language keys with coreDhruv Goel2012-07-123-71/+30
| | | | | | | Language keys removed from mods folder and added to language/en/acp/search.php PHPBB3-10946
* [feature/sphinx-fulltext-search] improve classes in functions-sphinx.phpDhruv Goel2012-07-121-21/+17
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] fix config variablesDhruv Goel2012-07-121-8/+8
| | | | | | | | | | config variables now use class property for unique id PHPBB3-10946 Conflicts: phpBB/includes/search/fulltext_sphinx.php
* [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-apiDhruv Goel2012-07-121-1202/+0
| | | | | | also need to add the latest sphinx api instead of this. PHPBB3-10946
* [feature/sphinx-fulltext-search] include sample sphinx.conf in docsDhruv Goel2012-07-121-0/+96
| | | | PHPBB3-10946
* [feature/sphinx-fulltext-search] minor fixes in formattingDhruv Goel2012-07-124-9/+5
| | | | | | | Add a newline at the end of files. Update License information in package docbloc. PHPBB3-10946
* [feature/sphinx-fulltext-search] update config fileDhruv Goel2012-07-121-2/+3
| | | | | | Sphinx config file updated according to new documentation. PHPBB3-10946
* [feature/sphinx-fulltext-search] minor changesDhruv Goel2012-07-121-14/+18
| | | | | | | some minor code changes to make it working against current develop and comply with other search backend coding convetions. PHPBB3-10946
* [feature/sphinx-fulltext-search] MOD by naderman installed in phpbbDhruv Goel2012-07-124-0/+2940
| | | | PHPBB3-10946
* Merge remote-tracking branch 'Fyorl/ticket/10941' into developAndreas Fischer2012-07-0916-0/+610
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10941: (30 commits) [ticket/10941] Removed superfluous array [ticket/10941] File 'txt' now too big so changed tests to reflect that [ticket/10941] Added a comment to ensure tags stay uppercase [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob [ticket/10941] Added tests/upload/fixture/copies to tracking [ticket/10941] Fixed form test test_too_large [ticket/10941] Replaced use of English with language system [ticket/10941] Renamed classes and filenames so that tests run [ticket/10941] Moved comment into markTestIncomplete parameter [ticket/10941] Removed manual includes of mock classes [ticket/10941] Added subdirectory for file operations [ticket/10941] Added some comments for clarification [ticket/10941] Fixed a failing test [ticket/10941] Rearranged tests into their own classes or methods [ticket/10941] Removed the incomplete mark as is_image is fixed [ticket/10941] Refactored tearDown to stop iterating over the directory. [ticket/10941] Refactored init_filespec to return new object. [ticket/10941] Minor typo fixes [ticket/10941] Changed assertTrue to assertEquals [ticket/10941] Now actually checks for the value of errors. ...
| * [ticket/10941] Removed superfluous arrayFyorl2012-07-091-1/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] File 'txt' now too big so changed tests to reflect thatFyorl2012-07-091-1/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Added a comment to ensure tags stay uppercaseFyorl2012-07-091-0/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Modified tearDown to use DirectoryIterator instead of globFyorl2012-07-091-2/+7
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Added tests/upload/fixture/copies to trackingFyorl2012-07-091-0/+0
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Fixed form test test_too_largeFyorl2012-07-091-2/+2
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Replaced use of English with language systemFyorl2012-07-091-2/+2
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Renamed classes and filenames so that tests runFyorl2012-07-092-5/+7
| | | | | | | | | | | | | | Also fixed some minor issues that weren't flagged before because the tests were being ignored. PHPBB3-10941
| * [ticket/10941] Moved comment into markTestIncomplete parameterFyorl2012-07-091-3/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Removed manual includes of mock classesFyorl2012-07-093-5/+3
| | | | | | | | | | | | | | Also marked a test as incomplete even though this appears to be ignored when actually running the tests. PHPBB3-10941
| * [ticket/10941] Added subdirectory for file operationsFyorl2012-07-098-22/+8
| | | | | | | | | | | | Also removed common.php as it was unnecessary. PHPBB3-10941
| * [ticket/10941] Added some comments for clarificationFyorl2012-07-092-0/+15
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Fixed a failing testFyorl2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | Since the is_image change, the filespec class no longer trusts the browser's reported mimetype and instead checks the file itself. Thus pretending a text file had the mimetype of an image will no longer fail, the file will simply not be treated as an image. PHPBB3-10941
| * [ticket/10941] Rearranged tests into their own classes or methodsFyorl2012-07-094-110/+151
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Removed the incomplete mark as is_image is fixedFyorl2012-07-091-11/+6
| | | | | | | | | | | | | | | | Had to remove one of the tests due to a small limitation with the functional testing framework. May mark the test as incomplete again pending further comments. PHPBB3-10941
| * [ticket/10941] Refactored tearDown to stop iterating over the directory.Fyorl2012-07-091-20/+15
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Refactored init_filespec to return new object.Fyorl2012-07-091-27/+26
| | | | | | | | | | | | | | Removed $filespec as a property of the filespec test and instead just instantiate new objects. PHPBB3-10941
| * [ticket/10941] Minor typo fixesFyorl2012-07-092-3/+1
| | | | | | | | | | | | Removed superfluous $user = null; that was left over from refactoring. PHPBB3-10941
| * [ticket/10941] Changed assertTrue to assertEqualsFyorl2012-07-091-1/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Now actually checks for the value of errors.Fyorl2012-07-093-25/+29
| | | | | | | | | | | | | | | | Uses phpbb_mock_lang to return the key used when setting errors to allow that key to be checked for during tests rather than just checking if any error was set. PHPBB3-10941
| * [ticket/10941] Re-arranged dataProvidor methods to be near their callersFyorl2012-07-091-67/+67
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Added a comment explaining the incomplete testFyorl2012-07-091-0/+6
| | | | | | | | PHPBB3-10941
| * [ticket/10941] tearDown() now uses explicit file listFyorl2012-07-091-5/+19
| | | | | | | | | | | | Instances of $it also renamed for clarity. PHPBB3-10941
| * [ticket/10941] Minor adjustments as per PR commentsFyorl2012-07-098-47/+81
| | | | | | | | | | | | Added some comments clarifying globals and lowercased fixture filenames PHPBB3-10941
| * [ticket/10941] Marked broken test as incompleteFyorl2012-07-091-0/+1
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Added functional tests for the fileupload classFyorl2012-07-095-0/+86
| | | | | | | | | | | | | | | | | | | | NOTE: test_form_upload() is broken. Uploading files via Symfony fails to retain $_FILES['fileupload']['type'] even if it set explicitely. This appears to be a bug in Symfony. Since the current version of filespec::is_image() relies on the mimetype, these tests will __fail__. filespec::is_image() has been fixed in https://github.com/phpbb/phpbb3/pull/833 however. PHPBB3-10941
| * [ticket/10941] Unit tests for fileupload class addedFyorl2012-07-083-0/+132
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Finished filespec testsFyorl2012-07-082-0/+91
| | | | | | | | PHPBB3-10941
| * [ticket/10941] Minor adjustments as per PR commentsFyorl2012-07-086-65/+36
| | | | | | | | | | | | | | Switched from dirname(__FILE__) to just __DIR__. Removed static definition from data provider methods. PHPBB3-10941
| * [ticket/10941] Unit tests for filespec classFyorl2012-07-082-0/+238
|/ | | | PHPBB3-10941
* Merge remote-tracking branch 'github-bantu/ticket/10973' into developNils Adermann2012-07-0820-31/+4
|\ | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10973: [ticket/10973] Drop all require_once for mocks. Use autoloading. [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests. Conflicts: tests/bbcode/url_bbcode_test.php tests/text_processing/censor_text_test.php