1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

13520 Commits

Author SHA1 Message Date
Drae
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
2012-07-18 14:31:50 +01:00
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
Andreas Fischer
b176b86f11 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
2012-07-18 09:46:32 +02:00
Andreas Fischer
eeef82ecc5 Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus
* Noxwizard/ticket/10996:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
2012-07-18 09:46:14 +02:00
Patrick Webster
d157c3b3f4 [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
PHPBB3-10996
2012-07-18 01:22:24 -05:00
Nils Adermann
a3757763ac Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL
2012-07-17 21:13:05 +02:00
Nils Adermann
4a87bc2aa9 Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus
* github-noxwizard/ticket/10678:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL

Conflicts:
	tests/RUNNING_TESTS.txt
2012-07-17 21:12:47 +02:00
Nils Adermann
2090ecfb8f Merge remote-tracking branch 'github-bantu/ticket/10969' into develop
* github-bantu/ticket/10969:
  [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
  [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
2012-07-17 20:58:50 +02:00
Andreas Fischer
a4e699db49 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:48 +02:00
Andreas Fischer
0f70c930df Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympus
* bantu/ticket/10995:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:41 +02:00
Patrick Webster
ae07e80a65 [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
PHPBB3-10995
2012-07-17 20:53:29 +02:00
Andreas Fischer
0de3b899c7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:30 +02:00
Andreas Fischer
3a70bc2c75 Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympus
* mvinny/ticket/10789:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:17 +02:00
Nils Adermann
fb34a7aa64 Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop
* github-exreaction/ticket/7598:
  [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
  [ticket/7598] Inactive users action notification (ACP)
2012-07-17 20:32:07 +02:00
Andreas Fischer
6980b3dcfd Merge remote-tracking branch 'nickvergessen/ticket/10942' into develop
* nickvergessen/ticket/10942:
  [ticket/10942] Avoid possible conflicts with magic words in unit tests
  [ticket/10942] Add access modifiers
  [ticket/10942] Use ANSI SQL standard || in dbal.php
  [ticket/10942] Fix up unit tests for sql_case()
  [ticket/10942] Require same data type and do not cast expressions automatically
  [ticket/10942] Make unit tests for sql_case simpler
  [ticket/10942] Add a comment why we cast to sql_case()
  [ticket/10942] Rename method sql_conditional() to sql_case()
  [ticket/10942] Change term string to expression to avoid confusion
  [ticket/10942] Fix sql_conditional for mssql, postgre and oracle
  [ticket/10942] Fix function name on order_lower_test.php
  [ticket/10942] Add unit tests for sql_concatenate
  [ticket/10942] Add sql_concatenate to dbal
  [ticket/10942] Add unit tests for sql_conditional
  [ticket/10942] Add sql_conditional to dbal
2012-07-17 17:59:56 +02:00
Joas Schilling
1b826842aa [ticket/10942] Avoid possible conflicts with magic words in unit tests
PHPBB3-10942
2012-07-16 16:59:40 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
PHPBB3-7598
2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP)
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
2012-07-13 22:18:28 -05:00
Andreas Fischer
b45bc27339 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:58 +02:00
Andreas Fischer
8f5182bf84 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:40 +02:00
Andreas Fischer
35e18a49a9 Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11
* Noxwizard/ticket/10978:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:19 +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