diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 23:17:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 23:17:58 +0100 |
| commit | 5d783464538807ef68f34d83d963af9e93a7268b (patch) | |
| tree | 11406cd46cf3ea44d2a5eeb0606c7481d5a3c96f /phpBB/develop | |
| parent | aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0 (diff) | |
| parent | b2a252d2748be0f18901db5fc0294566af04a2dc (diff) | |
| download | forums-5d783464538807ef68f34d83d963af9e93a7268b.tar forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.gz forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.bz2 forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.xz forums-5d783464538807ef68f34d83d963af9e93a7268b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11227] @return void -> @return null in develop-olympus.
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/generate_utf_casefold.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_confusables.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_tables.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/utf_normalizer_test.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php index 5b99f3e55e..ad511a6153 100644 --- a/phpBB/develop/generate_utf_casefold.php +++ b/phpBB/develop/generate_utf_casefold.php @@ -111,7 +111,7 @@ function my_var_export($var) * Download a file to the develop/ dir * * @param string $url URL of the file to download -* @return void +* @return null */ function download($url) { diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php index 027d75b661..763d8ee875 100644 --- a/phpBB/develop/generate_utf_confusables.php +++ b/phpBB/develop/generate_utf_confusables.php @@ -199,7 +199,7 @@ function my_var_export($var) * Download a file to the develop/ dir * * @param string $url URL of the file to download -* @return void +* @return null */ function download($url) { diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php index 71a5bea851..e5d907d6a5 100644 --- a/phpBB/develop/generate_utf_tables.php +++ b/phpBB/develop/generate_utf_tables.php @@ -481,7 +481,7 @@ function my_var_export($var) * Download a file to the develop/ dir * * @param string $url URL of the file to download -* @return void +* @return null */ function download($url) { diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php index 186e10fea2..af8556507f 100644 --- a/phpBB/develop/utf_normalizer_test.php +++ b/phpBB/develop/utf_normalizer_test.php @@ -222,7 +222,7 @@ die("\n\nALL TESTS PASSED SUCCESSFULLY\n"); * Download a file to the develop/ dir * * @param string $url URL of the file to download -* @return void +* @return null */ function download($url) { |