1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00

10789 Commits

Author SHA1 Message Date
Andreas Fischer
a89be371e8 Merge branch 'develop-olympus' into develop
* 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.
2011-02-20 18:33:59 +01:00
Andreas Fischer
69449417ba Merge branch 'ticket/p/10049' into develop-olympus
* ticket/p/10049:
  [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.
2011-02-20 18:32:33 +01:00
Oleg Pudeyev
c025d6079b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:19 -05:00
Oleg Pudeyev
53a6cd607e Merge branch 'ticket/bantu/10047' into develop-olympus
* ticket/bantu/10047:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:01 -05:00
Oleg Pudeyev
6902ecf6a9 [ticket/10049] Mark session init test incomplete for now.
This test passes by itself but fails when run as part of the
compete suite. Mark it incomplete to avoid breaking the suite.

PHPBB3-10049
2011-02-20 08:53:15 -05:00
Oleg Pudeyev
c1e198e721 [ticket/10049] Mark session continue test incomplete for now.
I am unable to find any code revision in which this test worked.
Thus to not break the entire suite I mark it incomplete.

PHPBB3-10049
2011-02-20 08:45:59 -05:00
Oleg Pudeyev
f3ab9da0e9 [ticket/10049] Globalize $_SID.
PHPBB3-10049
2011-02-19 20:54:34 -05:00
Oleg Pudeyev
26b922ac3f [ticket/10049] Chase assertResultEquals rename.
cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.

Parameter order also changed; chase that too.

PHPBB3-10049
2011-02-19 20:54:08 -05:00
Oleg Pudeyev
0cf741f343 [ticket/10049] Fixed requires in session tests and mock.
PHPBB3-10049
2011-02-19 20:40:32 -05:00
Oleg Pudeyev
1abf7ad809 [ticket/10049] Renamed session test files to proper file names.
phpunit.xml.dist specifies that only files ending in _test.php
are test files; with the old names session tests were not run
as a result.

PHPBB3-10049
2011-02-19 20:30:46 -05:00
Andreas Fischer
aba31aeff9 [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
PHPBB3-10047
2011-02-19 14:30:39 +01:00
Oleg Pudeyev
f24fe7b09e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP

Conflicts:
	phpBB/install/database_update.php
2011-02-17 17:11:55 -05:00
Oleg Pudeyev
676daf3076 Merge branch 'ticket/nickvergessen/9944' into develop-olympus
* ticket/nickvergessen/9944:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP
2011-02-17 17:03:08 -05:00
Andreas Fischer
9c268a21dd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10044] Updated invocation documentation.
  [ticket/10044] Stop when failed to retrieve network/collaborators.
  [ticket/10044] Added -h to setup_github_network.php.
  [ticket/10044] Error handling for remote requests in setup_github_network.php
  [ticket/10044] Made setup_github_network.php runnable as a script
2011-02-17 14:57:47 +01:00
Andreas Fischer
622da172d2 Merge branch 'ticket/p/10044' into develop-olympus
* ticket/p/10044:
  [ticket/10044] Updated invocation documentation.
  [ticket/10044] Stop when failed to retrieve network/collaborators.
  [ticket/10044] Added -h to setup_github_network.php.
  [ticket/10044] Error handling for remote requests in setup_github_network.php
  [ticket/10044] Made setup_github_network.php runnable as a script
2011-02-17 14:56:30 +01:00
Oleg Pudeyev
5af3cfe9ca [ticket/10044] Updated invocation documentation.
PHPBB3-10044
2011-02-16 21:13:35 -05:00
Igor Wiedler
19a0c16ed6 Merge branch 'ticket/nickvergessen/10045' into develop
* ticket/nickvergessen/10045:
  [ticket/10045] Update version in some more files.
  [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
2011-02-16 16:13:37 +01:00
Joas Schilling
59454ccd99 [ticket/10045] Update version in some more files.
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)

PHPBB3-10045
2011-02-16 16:06:23 +01:00
Nils Adermann
bd51bbda4e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/refactor-db-testcase] Further improve error messages.
  [task/refactor-db-testcase] Do not show db password on connect error
  [task/refactor-db-testcase] Improve error message of db tests
  [task/refactor-db-testcase] Refactor phpbb_database_test_case
2011-02-16 11:55:43 +01:00
Nils Adermann
f3a3ec438f Merge branch 'task/refactor-db-testcase' into develop-olympus
* task/refactor-db-testcase:
  [task/refactor-db-testcase] Further improve error messages.
  [task/refactor-db-testcase] Do not show db password on connect error
  [task/refactor-db-testcase] Improve error message of db tests
  [task/refactor-db-testcase] Refactor phpbb_database_test_case
2011-02-16 11:53:54 +01:00
Joas Schilling
528c54f0f7 [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
PHPBB3-10045
2011-02-16 11:29:49 +01:00
Oleg Pudeyev
bd8e5ff79e [task/refactor-db-testcase] Further improve error messages.
PHPBB3-10043
2011-02-15 21:08:33 -05:00
Oleg Pudeyev
ed53cef0aa [ticket/10044] Stop when failed to retrieve network/collaborators.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
bf137b7005 [ticket/10044] Added -h to setup_github_network.php.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
30c46a6e0c [ticket/10044] Error handling for remote requests in setup_github_network.php
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
0f3378ca28 [ticket/10044] Made setup_github_network.php runnable as a script
PHPBB3-10044
2011-02-15 04:45:54 -05:00
Joas Schilling
bcbbeacaf8 [ticket/9944] Add empty line before the while() so you can better read the code
PHPBB3-9944
2011-02-14 16:40:12 +01:00
Igor Wiedler
d3718bf5d4 [task/refactor-db-testcase] Do not show db password on connect error
PHPBB3-10043
2011-02-14 15:25:05 +01:00
Igor Wiedler
17b17bc939 [task/refactor-db-testcase] Improve error message of db tests
If database tests cannot be run the error message is ambigous. This
commit makes it clearer:

- whether the supplied dbms is supported by us
- which dbms are supported by us
- whether the required PDO extension is loaded

PHPBB3-10043
2011-02-14 14:48:42 +01:00
Igor Wiedler
6c7f49f561 [task/refactor-db-testcase] Refactor phpbb_database_test_case
Move most of the methods to a separate connection manager class. The
test case creates a manager to handle database creation, schema loading
and more. Most of the methods could be simplified because they can
access shared pdo, config and dbms data.

PHPBB3-10043
2011-02-14 00:24:55 +01:00
Igor Wiedler
1cc5087c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8904] Show default value for numeric custom profile fields when editing
2011-02-13 18:33:27 +01:00
Igor Wiedler
ecb29e6027 Merge branch 'ticket/hammerhead/8904' into develop-olympus
* ticket/hammerhead/8904:
  [ticket/8904] Show default value for numeric custom profile fields when editing
2011-02-13 18:33:15 +01:00
Niklas Schmidtmer
c717e44094 [ticket/8904] Show default value for numeric custom profile fields when editing
When displaying the default value for a numeric custom profile field, only use
request_var to obtain the value on creation. When editing, it will always
override the actual value with an empty string, as this is request_var's default
return value.

PHPBB3-8904
2011-02-13 18:32:11 +01:00
Igor Wiedler
04bd2e640e Merge branch 'feature/system-cron' into develop
* feature/system-cron: (67 commits)
  [feature/system-cron] More tests for cron manager.
  [feature/system-cron] Added documentation for cron manager constructor.
  [feature/system-cron] Remove an unecessary assignment and an unecessary comment
  [feature/system-cron] Clarify comments about flush() call in cron.
  [feature/system-cron] preg_match returns int so cast to bool, fix comment
  [feature/system-cron] Rename lock() to acquire and unlock() to release.
  [feature/system-cron] Cache cron's task names.
  [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.
  [feature/system-cron] Add array type hints if appropriate and remove globals.
  [feature/system-cron] Make use of the new config class in locks.
  [feature/system-cron] Fix duplicate instantiation of class loader in tests.
  [feature/system-cron] Abstract the database locking mechanism out of cron.
  [feature/system-cron] Move tests to phpunit.xml and always load class loader
  [feature/system-cron] Basic tests for cron manager.
  [feature/system-cron] Added @param/@return documentation
  [feature/system-cron] Add phpDoc documentation for everything else.
  [feature/system-cron] Cast result in cron_manager::is_valid_name() to bool.
  [feature/system-cron] Add phpDoc documentation for phpbb_cron_manager class.
  [feature/system-cron] Add phpDoc documentation for phpbb_cron_lock class.
  [feature/system-cron] Adjust SQL query style to follow coding guidelines.
  ...
2011-02-13 15:54:42 +01:00
Oleg Pudeyev
1fd8d6de7f [feature/system-cron] More tests for cron manager.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Oleg Pudeyev
4e689c522f [feature/system-cron] Added documentation for cron manager constructor.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
92c278d39a [feature/system-cron] Remove an unecessary assignment and an unecessary comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
c6a8abb409 [feature/system-cron] Clarify comments about flush() call in cron.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a2c5e618b [feature/system-cron] preg_match returns int so cast to bool, fix comment
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
2e47409e80 [feature/system-cron] Rename lock() to acquire and unlock() to release.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
09b136272b [feature/system-cron] Cache cron's task names.
Instead of using a path relative to phpbb_root_path the path to the task
directory is directly passed to the cron manager. Dummy tasks are now
in the tests directory directly.

PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
7a8233020b [feature/system-cron] Use a RecursiveDirectoryIterator instead of readdir.
PHPBB3-9596
2011-02-12 22:05:54 -05:00
Nils Adermann
9bc62056b2 [feature/system-cron] Add array type hints if appropriate and remove globals.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
165b0ec0b2 [feature/system-cron] Make use of the new config class in locks.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
311a7ff753 [feature/system-cron] Fix duplicate instantiation of class loader in tests.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
3a3a8bb96d [feature/system-cron] Abstract the database locking mechanism out of cron.
Added a number of tests for the locking mechanism which can now lock
arbitrary config variables.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Nils Adermann
6e5e4721d8 [feature/system-cron] Move tests to phpunit.xml and always load class loader
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Oleg Pudeyev
4fbf3fbd40 [feature/system-cron] Basic tests for cron manager.
PHPBB3-9596
2011-02-12 22:05:53 -05:00
Oleg Pudeyev
53dd847dd5 [feature/system-cron] Added @param/@return documentation
Also adjusted some function descriptions for greater informativity.

PHPBB3-9596
2011-02-12 22:05:53 -05:00
Andreas Fischer
47702b8ca7 [feature/system-cron] Add phpDoc documentation for everything else.
PHPBB3-9596
2011-02-12 22:05:53 -05:00