Commit graph

11697 commits

Author SHA1 Message Date
Igor Wiedler
2e31dd56df Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
  [ticket/9805] Setup security repository for developers.
  [ticket/9805] Move check lower down.
  [ticket/9805] Better support for already existing repositories.
  [ticket/9805] Add dry-run option.
  [ticket/9805] Use getopt(), add a few options, extend show_usage().
  [ticket/9805] Script for easily cloning a whole github network.
2011-02-12 14:56:05 +01:00
Igor Wiedler
0588ba25cb Merge branch 'ticket/bantu/9805' into develop-olympus
* ticket/bantu/9805:
  [ticket/9805] Setup security repository for developers.
  [ticket/9805] Move check lower down.
  [ticket/9805] Better support for already existing repositories.
  [ticket/9805] Add dry-run option.
  [ticket/9805] Use getopt(), add a few options, extend show_usage().
  [ticket/9805] Script for easily cloning a whole github network.
2011-02-12 14:55:40 +01:00
Igor Wiedler
53b97b57a0 Merge branch 'ticket/p/10013' into develop
* ticket/p/10013:
  [ticket/10013] Use mkdir to create directory trees.
  [ticket/10013] Fixed cache test to create intermediate directories.
  [ticket/10013] Changed cache test to use tests/tmp/cache as cache directory
2011-02-12 14:45:14 +01:00
Oleg Pudeyev
0765f9ba7f [ticket/10013] Use mkdir to create directory trees.
PHPBB3-10013
2011-02-12 14:44:53 +01:00
Oleg Pudeyev
4e446277a5 [ticket/10013] Fixed cache test to create intermediate directories.
PHPBB3-10013
2011-02-12 14:44:53 +01:00
Oleg Pudeyev
8de411cc25 [ticket/10013] Changed cache test to use tests/tmp/cache as cache directory
This is the first step of making the test suite use a single directory
for writing files to, this directory being tests/tmp.

The cache test, instead of tests/cache/tmp, now writes to tests/tmp/cache.

Also remove cache directory in setUp method, in case an earlier test run
did not complete successfully and the cache directory was not cleaned up.

Finally, this change makes the cache test take responsibility over the entire
contents of its cache directory.

PHPBB3-10013
2011-02-12 14:44:53 +01:00
Andreas Fischer
5c009997b2 Merge branch 'ticket/p/10029' into develop-olympus
* ticket/p/10029:
  [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
2011-02-10 00:20:34 +01:00
Oleg Pudeyev
0e861ac3ab [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
PHPBB3-10029
2011-02-09 02:19:50 -05:00
Joas Schilling
65020fd5c1 [ticket/9675] Correctly check whether the style/component is still in use.
And don't allow to delete it in that case.

PHPBB3-9675
2011-02-08 14:57:43 +01:00
Joas Schilling
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication.
PHPBB3-9675
2011-02-08 14:57:42 +01:00
Joas Schilling
18fedfce17 [ticket/9675] Adjust the language-string to reflect the changes.
PHPBB3-9675
2011-02-08 14:57:29 +01:00
Joas Schilling
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style.
PHPBB3-9675
2011-02-08 14:27:27 +01:00
Andreas Fischer
f50d74506a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9949] Unit tests for user::lang()
  [ticket/9949] $user->lang() uses last int-value to get the key not first
2011-02-07 16:32:25 +01:00
Andreas Fischer
df78a3a62d Merge branch 'ticket/nickvergessen/9949' into develop-olympus
* ticket/nickvergessen/9949:
  [ticket/9949] Unit tests for user::lang()
  [ticket/9949] $user->lang() uses last int-value to get the key not first
2011-02-07 16:30:43 +01:00
Andreas Fischer
3c04e6db97 [ticket/9949] Unit tests for user::lang()
PHPBB3-9949
2011-02-07 16:29:53 +01:00
Andreas Fischer
ec143edaf1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9966] Language download in ACP creates index.html and misses captcha_*
2011-02-04 17:41:39 +01:00
Andreas Fischer
36a4c410ce Merge branch 'ticket/nickvergessen/9966' into develop-olympus
* ticket/nickvergessen/9966:
  [ticket/9966] Language download in ACP creates index.html and misses captcha_*
2011-02-04 17:36:14 +01:00
Andreas Fischer
bdc590aac8 Merge branch 'ticket/nickvergessen/9823' into develop
* ticket/nickvergessen/9823:
  [ticket/9823] Replace 0x80000000 with -2147483648 in tests.
  [ticket/9823] Move mock file into the mock/ folder.
  [ticket/9823] Update Unit tests to the new system and correct some minor issues
  [ticket/9823] Update copyright year and add newline at the end of the file.
  [ticket/9823] Correct unit-tests to use self:: instead of the class-name.
  [ticket/9823] Unit tests for validate_config_vars.
  [ticket/9823] Unit tests for build_cfg_template.
  [ticket/9823] Unit tests for validate_rang.
  [ticket/9823] Unit tests for h_radio.
  [ticket/9823] Moving the functions. Unit tests for build_select.

Conflicts:
	phpBB/adm/index.php
2011-02-04 00:32:10 +01:00
Andreas Fischer
7dc2932321 [ticket/9823] Replace 0x80000000 with -2147483648 in tests.
See 181f2551cf

PHPBB3-9823
2011-02-04 00:28:33 +01:00
Andreas Fischer
4aafe4b422 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10020] Fix 32-bit php braindamage around INT_MIN.
  [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
2011-02-04 00:08:35 +01:00
Andreas Fischer
181f2551cf Merge branch 'ticket/p/10020' into develop-olympus
* ticket/p/10020:
  [ticket/10020] Fix 32-bit php braindamage around INT_MIN.
  [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
2011-02-04 00:05:52 +01:00
Oleg Pudeyev
d13efa41c5 [ticket/10020] Fix 32-bit php braindamage around INT_MIN.
On 32-bit php, -2147483648, despite fitting in the int type,
is for some reason made into a floating-point value. Use an
explicit cast to make it an integer.

PHPBB3-10020
2011-02-04 00:02:38 +01:00
Oleg Pudeyev
15992ceff9 [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
PHPBB3-10020
2011-02-04 00:01:49 +01:00
Andreas Fischer
50bdb5da89 [ticket/9805] Setup security repository for developers.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
67fe441f7e [ticket/9805] Move check lower down.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
e1ae8c6a71 [ticket/9805] Better support for already existing repositories.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
8eee36dc0f [ticket/9805] Add dry-run option.
PHPBB3-9805
2011-02-03 11:12:48 +01:00
Andreas Fischer
57bd0c74e5 [ticket/9805] Use getopt(), add a few options, extend show_usage().
PHPBB3-9805
2011-02-03 11:12:41 +01:00
Joas Schilling
9846d806f3 [ticket/9823] Move mock file into the mock/ folder.
PHPBB3-9823
2011-02-01 14:54:29 +01:00
Joas Schilling
6b00d7aa09 [ticket/9823] Update Unit tests to the new system and correct some minor issues
PHPBB3-9823
2011-02-01 14:09:52 +01:00
Joas Schilling
2b70f3d0e2 [ticket/9823] Update copyright year and add newline at the end of the file.
PHPBB3-9823
2011-02-01 13:38:46 +01:00
Joas Schilling
1dd5058d51 [ticket/9823] Correct unit-tests to use self:: instead of the class-name.
PHPBB3-9823
2011-02-01 13:38:45 +01:00
Joas Schilling
737849bc23 [ticket/9823] Unit tests for validate_config_vars.
Fix some documentations and use the $max-var instead of the magic-number
in validate_config_vars.

PHPBB3-9823
2011-02-01 13:38:44 +01:00
Joas Schilling
11e3804f97 [ticket/9823] Unit tests for build_cfg_template.
PHPBB3-9823
2011-02-01 13:38:43 +01:00
Joas Schilling
c80afb555e [ticket/9823] Unit tests for validate_rang.
PHPBB3-9823
2011-02-01 13:38:42 +01:00
Joas Schilling
d59327a9c4 [ticket/9823] Unit tests for h_radio.
PHPBB3-9823
2011-02-01 13:38:41 +01:00
Joas Schilling
eb2de91e7b [ticket/9823] Moving the functions. Unit tests for build_select.
PHPBB3-9823
2011-02-01 13:38:40 +01:00
Andreas Fischer
270a0020ab Merge branch 'ticket/erikfrerejean/10011' into develop
* ticket/erikfrerejean/10011:
  [ticket/10011] Tests can't be ran on PHP < 5.3
2011-02-01 07:54:27 +01:00
Andreas Fischer
8376bf2807 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10014] Clearly indicate fatal errors in file acm.
2011-02-01 07:42:51 +01:00
Andreas Fischer
b414a4d107 Merge branch 'ticket/p/10014' into develop-olympus
* ticket/p/10014:
  [ticket/10014] Clearly indicate fatal errors in file acm.
2011-02-01 07:41:21 +01:00
Erik Frèrejean
2e54212309 [ticket/10011] Tests can't be ran on PHP < 5.3
Apply the `__DIR__` fix to some remaining Ascraeus tests

PHPBB3-10011
2011-01-31 14:02:30 +01:00
Andreas Fischer
d06657c995 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10011] Tests don't work on PHP < 5.3

Conflicts:
	tests/security/redirect_test.php
2011-01-31 13:26:20 +01:00
Andreas Fischer
e685c1c005 Merge branch 'ticket/erikfrerejean/10011' into develop-olympus
* ticket/erikfrerejean/10011:
  [ticket/10011] Tests don't work on PHP < 5.3
2011-01-31 13:18:37 +01:00
Erik Frèrejean
14891cdf4e [ticket/10011] Tests don't work on PHP < 5.3
Due to the usage of `__DIR__` for the file includes the tests can't
be ran on systems with PHP < 5.3. Replace all occurances of
`__DIR__` with `dirname(__FILE__)`.

PHPBB3-10011
2011-01-31 12:58:18 +01:00
Andreas Fischer
7ff0cff4cd Merge branch 'ticket/nickvergessen/8065' into develop
* ticket/nickvergessen/8065:
  [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
2011-01-30 13:31:34 +01:00
Joas Schilling
cfab695f3a [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
PHPBB3-8065
2011-01-30 13:30:18 +01:00
Andreas Fischer
426139ae77 Merge branch 'ticket/nickvergessen/8065' into develop
* ticket/nickvergessen/8065:
  [ticket/8065] Add an option to lock topics while moving them.
2011-01-30 01:27:23 +01:00
Joas Schilling
b526fb9678 [ticket/8065] Add an option to lock topics while moving them.
PHPBB3-8065
2011-01-30 01:23:20 +01:00
Andreas Fischer
bafe3d9484 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
2011-01-30 01:17:06 +01:00
Andreas Fischer
c3a4312650 Merge branch 'ticket/nickvergessen/9985' into develop-olympus
* ticket/nickvergessen/9985:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
2011-01-30 00:55:07 +01:00