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

13787 Commits

Author SHA1 Message Date
Dhruv Goel
97fda78e7d [feature/sphinx-fulltext-search] Make different files for different classes
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
2012-07-12 17:32:00 +05:30
Dhruv Goel
10b706674e [feature/sphinx-fulltext-search] add binlog_path to config
binlog files are now added to the data folder.

PHPBB3-10946
2012-07-12 17:31:58 +05:30
Dhruv Goel
39f8a5fa9f [feature/sphinx-fulltext-search] use sql_build_query for query
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
2012-07-12 17:31:57 +05:30
Dhruv Goel
bfd01f0187 [feature/sphinx-fulltext-search] remove all reference returns
PHPBB3-10946
2012-07-12 17:31:56 +05:30
Dhruv Goel
f609555b1a [feature/sphinx-fulltext-search] integrate sphinx language keys with core
Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
2012-07-12 17:31:49 +05:30
Dhruv Goel
74a7407927 [feature/sphinx-fulltext-search] improve classes in functions-sphinx.php
PHPBB3-10946
2012-07-12 17:27:29 +05:30
Dhruv Goel
02588069f0 [feature/sphinx-fulltext-search] fix config variables
config variables now use class property for unique id

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
2012-07-12 17:27:28 +05:30
Dhruv Goel
455a35d836 [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-api
also need to add the latest sphinx api instead of this.

PHPBB3-10946
2012-07-12 17:27:27 +05:30
Dhruv Goel
a3b2caf841 [feature/sphinx-fulltext-search] include sample sphinx.conf in docs
PHPBB3-10946
2012-07-12 17:27:26 +05:30
Dhruv Goel
8d76bc45ee [feature/sphinx-fulltext-search] minor fixes in formatting
Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
2012-07-12 17:27:25 +05:30
Dhruv Goel
99d4660df6 [feature/sphinx-fulltext-search] update config file
Sphinx config file updated according to new documentation.

PHPBB3-10946
2012-07-12 17:27:24 +05:30
Dhruv Goel
fcf0d04b20 [feature/sphinx-fulltext-search] minor changes
some minor code changes to make it working against current develop
and comply with other search backend coding convetions.

PHPBB3-10946
2012-07-12 17:27:23 +05:30
Dhruv Goel
a50b0faf4a [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb
PHPBB3-10946
2012-07-12 17:27:22 +05:30
Joas Schilling
d883535b10 [ticket/10950] Remove deleted entries in tests instead of commenting them out
PHPBB3-10950
2012-07-11 13:05:36 +02:00
Joas Schilling
e68c1fb9e4 [ticket/10950] Use database count() and group by instead of doing that in php
PHPBB3-10950
2012-07-11 12:58:57 +02:00
Patrick Webster
dd6955f833 [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
PHPBB3-10978
2012-07-09 19:29:17 -05:00
Andreas Fischer
348d9b8829 Merge remote-tracking branch 'Fyorl/ticket/10941' into develop
* 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.
  ...
2012-07-09 15:10:36 +02:00
Fyorl
65d7aae2f3 [ticket/10941] Removed superfluous array
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
d046b25124 [ticket/10941] File 'txt' now too big so changed tests to reflect that
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
1b3589aae8 [ticket/10941] Added a comment to ensure tags stay uppercase
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
f470eee8ab [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
ae9b642b81 [ticket/10941] Added tests/upload/fixture/copies to tracking
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
c8059cf7e7 [ticket/10941] Fixed form test test_too_large
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
8d43a6e851 [ticket/10941] Replaced use of English with language system
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
e0b63df6a4 [ticket/10941] Renamed classes and filenames so that tests run
Also fixed some minor issues that weren't flagged before because
the tests were being ignored.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
6a1c686025 [ticket/10941] Moved comment into markTestIncomplete parameter
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
9f3a02d475 [ticket/10941] Removed manual includes of mock classes
Also marked a test as incomplete even though this appears to be
ignored when actually running the tests.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
580cec619b [ticket/10941] Added subdirectory for file operations
Also removed common.php as it was unnecessary.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
d89af53f63 [ticket/10941] Added some comments for clarification
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
af8020b388 [ticket/10941] Fixed a failing test
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
2012-07-09 14:08:20 +01:00
Fyorl
b65f08dd95 [ticket/10941] Rearranged tests into their own classes or methods
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
a4717ef525 [ticket/10941] Removed the incomplete mark as is_image is fixed
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
2012-07-09 14:08:19 +01:00
Fyorl
682757c1cb [ticket/10941] Refactored tearDown to stop iterating over the directory.
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
ff7e5d73f7 [ticket/10941] Refactored init_filespec to return new object.
Removed $filespec as a property of the filespec test and instead
just instantiate new objects.

PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
61d74007a4 [ticket/10941] Minor typo fixes
Removed superfluous $user = null; that was left over from refactoring.

PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
1bb64ab23e [ticket/10941] Changed assertTrue to assertEquals
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
19405a7f47 [ticket/10941] Now actually checks for the value of errors.
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
2012-07-09 14:08:19 +01:00
Fyorl
943af957e6 [ticket/10941] Re-arranged dataProvidor methods to be near their callers
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
59a7b10f14 [ticket/10941] Added a comment explaining the incomplete test
PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
f2bbbdaafa [ticket/10941] tearDown() now uses explicit file list
Instances of $it also renamed for clarity.

PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
82ca2c8b08 [ticket/10941] Minor adjustments as per PR comments
Added some comments clarifying globals and lowercased fixture filenames

PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
1233544c4a [ticket/10941] Marked broken test as incomplete
PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
5693036bf9 [ticket/10941] Added functional tests for the fileupload class
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
2012-07-09 14:08:17 +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
d6bd8928b5 [ticket/10941] Minor adjustments as per PR comments
Switched from dirname(__FILE__) to just __DIR__.
Removed static definition from data provider methods.

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
9f0259c473 Merge remote-tracking branch 'github-bantu/ticket/10973' into develop
* 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
2012-07-08 23:12:22 +02: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
Nils Adermann
088dbc0b54 Merge remote-tracking branch 'github-bantu/ticket/10974' into develop-olympus
* github-bantu/ticket/10974:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
2012-07-08 23:03:58 +02:00