Permalink
Browse files

Merge branch 'prep-release-3.0.9'

* prep-release-3.0.9: (359 commits)
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10247] Remove attempt_id as primary key from database_update.php
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
  [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column
  [prep-release-3.0.9] Bump database version to RC3 too.
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.
  ...
  • Loading branch information...
2 parents 7f21a5f + e6572b7 commit c8da5ad9f42d8ced1aead79a42cc5caee5c5a2ff @bantu bantu committed Jul 10, 2011
Showing with 6,130 additions and 2,110 deletions.
  1. +4 −0 .gitignore
  2. +20 −0 README.md
  3. +25 −13 build/build.xml
  4. +1 −1 build/build_helper.php
  5. +145 −0 build/phpdoc-phpbb.ini
  6. +36 −5 git-tools/hooks/commit-msg
  7. +2 −2 git-tools/hooks/prepare-commit-msg
  8. +175 −0 git-tools/merge.php
  9. +248 −0 git-tools/setup_github_network.php
  10. +10 −6 phpBB/adm/index.php
  11. +1 −1 phpBB/adm/style/acp_ban.html
  12. +4 −0 phpBB/adm/style/acp_email.html
  13. +9 −9 phpBB/adm/style/acp_forums.html
  14. +2 −2 phpBB/adm/style/acp_ranks.html
  15. +16 −1 phpBB/adm/style/acp_styles.html
  16. +4 −4 phpBB/adm/style/acp_users_overview.html
  17. +1 −1 phpBB/adm/style/captcha_recaptcha.html
  18. +2 −13 phpBB/adm/style/install_footer.html
  19. +2 −13 phpBB/adm/style/overall_footer.html
  20. +1 −12 phpBB/adm/style/simple_footer.html
  21. +1 −106 phpBB/common.php
  22. +12 −84 phpBB/cron.php
  23. +33 −2 phpBB/develop/create_schema_files.php
  24. +3 −3 phpBB/develop/create_variable_overview.php
  25. +3 −2 phpBB/develop/mysql_upgrader.php
  26. +14 −13 phpBB/docs/AUTHORS
  27. +388 −19 phpBB/docs/CHANGELOG.html
  28. +2 −2 phpBB/docs/FAQ.html
  29. +11 −4 phpBB/docs/INSTALL.html
  30. +2 −2 phpBB/docs/README.html
  31. +2 −2 phpBB/docs/auth_api.html
  32. +8 −3 phpBB/docs/coding-guidelines.html
  33. +4 −2 phpBB/docs/hook_system.html
  34. +60 −0 phpBB/docs/lighttpd.sample.conf
  35. +25 −6 phpBB/docs/{nginx.conf.sample → nginx.sample.conf}
  36. +14 −7 phpBB/download/file.php
  37. +27 −19 phpBB/feed.php
  38. +2 −2 phpBB/includes/acm/acm_file.php
  39. +145 −0 phpBB/includes/acm/acm_redis.php
  40. +84 −0 phpBB/includes/acm/acm_wincache.php
  41. +1 −1 phpBB/includes/acp/acp_bbcodes.php
  42. +13 −3 phpBB/includes/acp/acp_board.php
  43. +12 −0 phpBB/includes/acp/acp_disallow.php
  44. +35 −10 phpBB/includes/acp/acp_email.php
  45. +4 −0 phpBB/includes/acp/acp_icons.php
  46. +6 −6 phpBB/includes/acp/acp_language.php
  47. +1 −1 phpBB/includes/acp/acp_main.php
  48. +1 −1 phpBB/includes/acp/acp_profile.php
  49. +16 −2 phpBB/includes/acp/acp_search.php
  50. +218 −43 phpBB/includes/acp/acp_styles.php
  51. +3 −0 phpBB/includes/acp/acp_words.php
  52. +12 −2 phpBB/includes/auth.php
  53. +61 −4 phpBB/includes/auth/auth_db.php
  54. +1 −1 phpBB/includes/auth/auth_ldap.php
  55. +1 −18 phpBB/includes/cache.php
  56. +28 −28 phpBB/includes/captcha/captcha_gd.php
  57. +2 −2 phpBB/includes/captcha/captcha_gd_wave.php
  58. +2 −2 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
  59. +9 −4 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
  60. +6 −2 phpBB/includes/constants.php
  61. +304 −7 phpBB/includes/db/db_tools.php
  62. +11 −1 phpBB/includes/db/dbal.php
  63. +46 −3 phpBB/includes/db/firebird.php
  64. +10 −2 phpBB/includes/db/mssqlnative.php
  65. +2 −1 phpBB/includes/db/oracle.php
  66. +35 −1 phpBB/includes/db/postgres.php
  67. +61 −0 phpBB/includes/error_collector.php
  68. +115 −34 phpBB/includes/functions.php
  69. +14 −10 phpBB/includes/functions_admin.php
  70. +1 −0 phpBB/includes/functions_convert.php
  71. +1 −2 phpBB/includes/functions_display.php
  72. +105 −3 phpBB/includes/functions_posting.php
  73. +13 −1 phpBB/includes/functions_profile_fields.php
  74. +1 −1 phpBB/includes/functions_template.php
  75. +2 −2 phpBB/includes/functions_upload.php
  76. +44 −59 phpBB/includes/functions_user.php
  77. +1 −1 phpBB/includes/mcp/mcp_front.php
  78. +26 −25 phpBB/includes/mcp/mcp_main.php
  79. +2 −2 phpBB/includes/mcp/mcp_post.php
  80. +28 −16 phpBB/includes/message_parser.php
  81. +78 −25 phpBB/includes/session.php
  82. +150 −0 phpBB/includes/startup.php
  83. +2 −2 phpBB/includes/template.php
  84. +7 −0 phpBB/includes/ucp/ucp_activate.php
  85. +2 −2 phpBB/includes/ucp/ucp_pm.php
  86. +26 −5 phpBB/includes/ucp/ucp_pm_compose.php
  87. +1 −0 phpBB/includes/ucp/ucp_pm_viewfolder.php
  88. +4 −1 phpBB/includes/ucp/ucp_pm_viewmessage.php
  89. +1 −1 phpBB/includes/ucp/ucp_prefs.php
  90. +2 −2 phpBB/includes/ucp/ucp_register.php
  91. +2 −2 phpBB/install/convertors/convert_phpbb20.php
  92. +3 −0 phpBB/install/convertors/functions_phpbb20.php
  93. +460 −29 phpBB/install/database_update.php
  94. +13 −96 phpBB/install/index.php
  95. +1 −1 phpBB/install/install_install.php
  96. +17 −1 phpBB/install/schemas/firebird_schema.sql
  97. +29 −1 phpBB/install/schemas/mssql_schema.sql
  98. +18 −2 phpBB/install/schemas/mysql_40_schema.sql
  99. +18 −2 phpBB/install/schemas/mysql_41_schema.sql
  100. +25 −2 phpBB/install/schemas/oracle_schema.sql
  101. +20 −2 phpBB/install/schemas/postgres_schema.sql
  102. +15 −12 phpBB/install/schemas/schema_data.sql
  103. +18 −2 phpBB/install/schemas/sqlite_schema.sql
  104. +18 −12 phpBB/language/en/acp/board.php
  105. +1 −1 phpBB/language/en/acp/common.php
  106. +4 −2 phpBB/language/en/acp/email.php
  107. +1 −1 phpBB/language/en/acp/groups.php
  108. +5 −4 phpBB/language/en/acp/posting.php
  109. +6 −2 phpBB/language/en/acp/styles.php
  110. +3 −3 phpBB/language/en/captcha_recaptcha.php
  111. +4 −2 phpBB/language/en/common.php
  112. +3 −3 phpBB/language/en/install.php
  113. +2 −3 phpBB/language/en/mcp.php
  114. +1 −2 phpBB/language/en/memberlist.php
  115. +1 −0 phpBB/language/en/search.php
  116. +2 −0 phpBB/language/en/ucp.php
  117. +27 −3 phpBB/memberlist.php
  118. +11 −32 phpBB/posting.php
  119. +34 −22 phpBB/search.php
  120. +1 −12 phpBB/style.php
  121. +1 −1 phpBB/styles/prosilver/imageset/imageset.cfg
  122. BIN phpBB/styles/prosilver/imageset/site_logo.gif
  123. +1 −1 phpBB/styles/prosilver/style.cfg
  124. +2 −2 phpBB/styles/prosilver/template/attachment.html
  125. +1 −1 phpBB/styles/prosilver/template/login_body.html
  126. +2 −2 phpBB/styles/prosilver/template/mcp_post.html
  127. +1 −1 phpBB/styles/prosilver/template/mcp_topic.html
  128. +1 −1 phpBB/styles/prosilver/template/memberlist_im.html
  129. +1 −1 phpBB/styles/prosilver/template/memberlist_search.html
  130. +1 −12 phpBB/styles/prosilver/template/overall_footer.html
  131. +6 −11 phpBB/styles/prosilver/template/overall_header.html
  132. +1 −1 phpBB/styles/prosilver/template/posting_buttons.html
  133. +1 −1 phpBB/styles/prosilver/template/posting_smilies.html
  134. +1 −11 phpBB/styles/prosilver/template/simple_footer.html
  135. +2 −3 phpBB/styles/prosilver/template/simple_header.html
  136. +1 −1 phpBB/styles/prosilver/template/template.cfg
  137. +1 −1 phpBB/styles/prosilver/template/ucp_groups_manage.html
  138. +1 −11 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
  139. +3 −3 phpBB/styles/prosilver/template/viewforum_body.html
  140. +2 −3 phpBB/styles/prosilver/template/viewtopic_body.html
  141. +1 −12 phpBB/styles/prosilver/template/viewtopic_print.html
  142. +15 −5 phpBB/styles/prosilver/theme/colours.css
  143. +7 −5 phpBB/styles/prosilver/theme/cp.css
  144. +4 −1 phpBB/styles/prosilver/theme/forms.css
  145. +11 −7 phpBB/styles/prosilver/theme/links.css
  146. +2 −2 phpBB/styles/prosilver/theme/print.css
  147. +1 −1 phpBB/styles/prosilver/theme/theme.cfg
  148. +9 −0 phpBB/styles/prosilver/theme/tweaks.css
  149. +1 −1 phpBB/styles/subsilver2/imageset/imageset.cfg
  150. +1 −1 phpBB/styles/subsilver2/style.cfg
  151. +2 −2 phpBB/styles/subsilver2/template/attachment.html
  152. +1 −1 phpBB/styles/subsilver2/template/login_body.html
  153. +1 −1 phpBB/styles/subsilver2/template/mcp_topic.html
  154. +1 −1 phpBB/styles/subsilver2/template/memberlist_im.html
  155. +1 −12 phpBB/styles/subsilver2/template/overall_footer.html
  156. +2 −7 phpBB/styles/subsilver2/template/overall_header.html
  157. +1 −1 phpBB/styles/subsilver2/template/posting_body.html
  158. +1 −1 phpBB/styles/subsilver2/template/posting_buttons.html
  159. +1 −1 phpBB/styles/subsilver2/template/posting_smilies.html
  160. +1 −1 phpBB/styles/subsilver2/template/quickreply_editor.html
  161. +1 −1 phpBB/styles/subsilver2/template/searchbox.html
  162. +1 −12 phpBB/styles/subsilver2/template/simple_footer.html
  163. +0 −1 phpBB/styles/subsilver2/template/simple_header.html
  164. +1 −1 phpBB/styles/subsilver2/template/template.cfg
  165. +1 −10 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
  166. +1 −1 phpBB/styles/subsilver2/template/viewtopic_body.html
  167. +1 −10 phpBB/styles/subsilver2/template/viewtopic_print.html
  168. +10 −4 phpBB/styles/subsilver2/theme/stylesheet.css
  169. +1 −1 phpBB/styles/subsilver2/theme/theme.cfg
  170. +6 −0 phpBB/ucp.php
  171. +8 −1 phpBB/viewforum.php
  172. +13 −2 phpBB/viewtopic.php
  173. +1 −1 phpBB/web.config
  174. +25 −0 phpunit.xml.all
  175. +31 −0 phpunit.xml.dist
  176. +13 −4 tests/RUNNING_TESTS.txt
  177. +0 −69 tests/all_tests.php
  178. +63 −0 tests/bbcode/url_bbcode_test.php
  179. +9 −15 tests/{test_framework/framework.php → bootstrap.php}
  180. +0 −42 tests/dbal/all_tests.php
  181. +276 −0 tests/dbal/db_tools_test.php
  182. +25 −2 tests/dbal/{select.php → select_test.php}
  183. +1 −2 tests/dbal/{write.php → write_test.php}
  184. +73 −0 tests/mock/cache.php
  185. +63 −0 tests/mock/session_testable.php
  186. +20 −0 tests/mock_user.php
  187. +0 −40 tests/network/all_tests.php
  188. +4 −2 tests/network/{checkdnsrr.php → checkdnsrr_test.php}
  189. +55 −0 tests/profile/custom_test.php
  190. +31 −0 tests/profile/fixtures/profile_fields.xml
  191. +0 −40 tests/random/all_tests.php
  192. +1 −2 tests/random/{gen_rand_string.php → gen_rand_string_test.php}
  193. +46 −0 tests/random/mt_rand.php
  194. +0 −46 tests/regex/all_tests.php
  195. +50 −0 tests/regex/censor_test.php
  196. +1 −2 tests/regex/{email.php → email_test.php}
  197. +1 −2 tests/regex/{ipv4.php → ipv4_test.php}
  198. +1 −2 tests/regex/{ipv6.php → ipv6_test.php}
  199. +81 −0 tests/regex/password_complexity_test.php
  200. +1 −2 tests/regex/{url.php → url_test.php}
  201. +0 −41 tests/request/all_tests.php
  202. +2 −2 tests/request/{request_var.php → request_var_test.php}
  203. +1 −33 tests/security/{all_tests.php → base.php}
  204. +4 −4 tests/security/{extract_current_page.php → extract_current_page_test.php}
  205. +21 −0 tests/security/hash_test.php
  206. +7 −5 tests/security/{redirect.php → redirect_test.php}
  207. +121 −0 tests/session/continue_test.php
  208. +25 −0 tests/session/fixtures/sessions_empty.xml
  209. +37 −0 tests/session/fixtures/sessions_full.xml
  210. +56 −0 tests/session/init_test.php
  211. +171 −0 tests/session/testable_factory.php
  212. +0 −40 tests/template/all_tests.php
  213. +46 −206 tests/template/{template.php → template_test.php}
  214. +0 −3 tests/template/templates/_dummy_include.php
  215. +3 −0 tests/template/templates/_dummy_include.php.inc
  216. +1 −1 tests/template/templates/includephp.html
  217. +2 −2 tests/template/templates/loop_nested.html
  218. +42 −277 tests/test_framework/phpbb_database_test_case.php
  219. +346 −0 tests/test_framework/phpbb_database_test_connection_manager.php
  220. +15 −0 tests/test_framework/phpbb_test_case.php
  221. +0 −41 tests/text_processing/all_tests.php
  222. +2 −4 tests/text_processing/{make_clickable.php → make_clickable_test.php}
  223. +58 −0 tests/user/lang_test.php
  224. +0 −43 tests/utf/all_tests.php
  225. 0 tests/utf/data/.gitkeep
  226. +320 −0 tests/utf/normalizer_test.php
  227. +1 −2 tests/utf/utf8_clean_string_test.php
  228. +1 −2 tests/utf/utf8_wordwrap_test.php
View
@@ -1,8 +1,12 @@
*~
+phpunit.xml
phpBB/cache/*.php
+phpBB/cache/queue.php.lock
phpBB/config.php
phpBB/files/*
+phpBB/images/avatars/gallery/*
phpBB/images/avatars/upload/*
phpBB/store/*
tests/phpbb_unit_tests.sqlite2
tests/test_config.php
+tests/utf/data/*.txt
View
@@ -0,0 +1,20 @@
+[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
+
+## ABOUT
+
+phpBB is a free bulletin board written in PHP.
+
+## COMMUNITY
+
+Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).
+
+## CONTRIBUTE
+
+1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
+2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
+3. [Read our Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
+4. Send us a pull request
+
+## LICENSE
+
+[GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)
View
@@ -2,17 +2,18 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.0.8" />
- <property name="prevversion" value="3.0.8-RC1" />
- <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7-PL1" />
+ <property name="newversion" value="3.0.9" />
+ <property name="prevversion" value="3.0.8" />
+ <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.9-RC1, 3.0.9-RC2, 3.0.9-RC3, 3.0.9-RC4" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
<property name="versions" value="${oldversions}, ${newversion}" />
<!-- These are the main targets which you will probably want to use -->
<target name="package" depends="clean,prepare,create-package" />
- <target name="all" depends="clean,prepare,test,create-package" />
+ <target name="all" depends="clean,prepare,test,docs,create-package" />
+ <target name="build" depends="clean,prepare,test,docs" />
<target name="prepare">
<mkdir dir="build/logs" />
@@ -42,12 +43,11 @@
<delete dir="build/save" />
</target>
- <target name="test">
- <exec dir="tests"
- command="phpunit --log-junit ../build/logs/phpunit.xml
- --coverage-clover ../build/logs/clover.xml
- --coverage-html ../build/coverage
- phpbb_all_tests all_tests.php"
+ <target name="test" depends="clean,prepare">
+ <exec dir="."
+ command="phpunit --log-junit build/logs/phpunit.xml
+ --coverage-clover build/logs/clover.xml
+ --coverage-html build/coverage"
passthru="true" />
@@ -64,6 +64,18 @@
-->
</target>
+ <target name="docs">
+ <!-- only works if you setup phpdoctor:
+ git clone https://github.com/peej/phpdoctor.git
+ and then create an executable phpdoctor in your path containing
+ #!/bin/sh
+ php -f /path/to/phpdoctor/phpdoc.php $@
+ -->
+ <exec dir="build"
+ command="phpdoctor phpdoc-phpbb.ini"
+ passthru="true" />
+ </target>
+
<target name="old-version-diffs">
<foreach list="${oldversions}" param="version" target="old-version-diff" />
</target>
@@ -121,16 +133,16 @@
-->
<target name="export">
<exec dir="phpBB"
- command="git archive ${revision} | tar -x -C ../${dir}"
+ command="git archive ${revision} | tar -xf - -C ../${dir}"
checkreturn="true" />
<delete file="${dir}/config.php" />
<delete dir="${dir}/develop" />
<delete dir="${dir}/install/data" />
<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
<!-- set permissions of all files to 644, directories to 755 -->
- <exec dir="${dir}" command="find -type f|xargs chmod 644" escape="false" />
- <exec dir="${dir}" command="find -type d|xargs chmod 755" escape="false" />
+ <exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
+ <exec dir="${dir}" command="find . -type d|xargs chmod 755" escape="false" />
<!-- set permissions of some directories to 777 -->
<chmod mode="0777" file="${dir}/cache" />
<chmod mode="0777" file="${dir}/store" />
View
@@ -177,7 +177,7 @@ function collect_diff_files($diff_filename, $package_name)
}
// Is binary?
- if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match))
+ if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9._-]+\/\1 differ/i', $line, $match))
{
$binary[] = trim($match[1]);
}
View
@@ -0,0 +1,145 @@
+; Default configuration file for PHPDoctor
+
+; This config file will cause PHPDoctor to generate API documentation of
+; itself.
+
+
+; PHPDoctor settings
+; -----------------------------------------------------------------------------
+
+; Names of files to parse. This can be a single filename, or a comma separated
+; list of filenames. Wildcards are allowed.
+
+files = "*.php"
+
+; Names of files or directories to ignore. This can be a single filename, or a
+; comma separated list of filenames. Wildcards are NOT allowed.
+
+;ignore = "CVS, .svn, .git, _compiled"
+ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*,acm_xcache.php
+
+; The directory to look for files in, if not used the PHPDoctor will look in
+; the current directory (the directory it is run from).
+
+source_path = "../phpBB/"
+
+; If you do not want PHPDoctor to look in each sub directory for files
+; uncomment this line.
+
+;subdirs = off
+
+; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
+; than warnings and errors. Verbose mode outputs additional messages during
+; execution.
+
+quiet = on
+;verbose = on
+
+; Select the doclet to use for generating output.
+
+doclet = standard
+;doclet = debug
+
+; The directory to find the doclet in. Doclets control the HTML output of
+; phpDoctor and can be modified to suit your needs. They are expected to be
+; in a directory named after themselves at the location given.
+
+;doclet_path = ./doclets
+
+; Select the formatter to use for generating output.
+
+;formatter = htmlStandardFormatter
+
+; The directory to find the formatter in. Formatters convert textual markup
+; for use by the doclet.
+
+;formatter_path = ./formatters
+
+; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
+; new tags and to alter the behavour of existing tags and their output.
+
+;taglet_path = ./taglets
+
+; If the code you are parsing does not use package tags or not all elements
+; have package tags, use this setting to place unbound elements into a
+; particular package.
+
+default_package = "phpBB"
+
+use_class_path_as_package = off
+
+ignore_package_tags = off
+
+; Specifies the name of a HTML file containing text for the overview
+; documentation to be placed on the overview page. The path is relative to
+; "source_path" unless an absolute path is given.
+
+overview = ../README.md
+
+; Package comments will be looked for in a file named package.html in the same
+; directory as the first source file parsed in that package or in the directory
+; given below. If package comments are placed in the directory given below then
+; they should be named "<packageName>.html".
+
+package_comment_dir = ./
+
+; Parse out global variables and/or global constants?
+
+;globals = off
+;constants = off
+
+; Generate documentation for all class members
+
+;private = on
+
+; Generate documentation for public and protected class members
+
+;protected = on
+
+; Generate documentation for only public class members
+
+;public = on
+
+; Use the PEAR compatible handling of the docblock first sentence
+
+;pear_compat = on
+
+; Standard doclet settings
+; -----------------------------------------------------------------------------
+
+; The directory to place generated documentation in. If the given path is
+; relative to it will be relative to "source_path".
+
+d = "../build/api/"
+
+; Specifies the title to be placed in the HTML <title> tag.
+
+windowtitle = "phpBB3"
+
+; Specifies the title to be placed near the top of the overview summary file.
+
+doctitle = "phpBB3 Sourcecode Documentation"
+
+; Specifies the header text to be placed at the top of each output file. The
+; header will be placed to the right of the upper navigation bar.
+
+header = "phpBB3"
+
+; Specifies the footer text to be placed at the bottom of each output file. The
+; footer will be placed to the right of the lower navigation bar.
+
+footer = "phpBB3"
+
+; Specifies the text to be placed at the bottom of each output file. The text
+; will be placed at the bottom of the page, below the lower navigation bar.
+
+;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"
+
+; Create a class tree?
+
+;tree = off
+
+; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.
+
+include_source = off
+
View
@@ -55,12 +55,24 @@ quit()
fi
}
-msg=$(grep -nE '.{81,}' "$1");
+# Check for empty commit message
+if ! grep -qv '^#' "$1"
+then
+ # Commit message is empty (or contains only comments).
+ # Let git handle this.
+ # It will abort with a message like so:
+ #
+ # Aborting commit due to empty commit message.
+ exit 0
+fi
+
+msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
if [ $? -eq 0 ]
then
- echo "The following lines are greater than 80 characters long:\n" >&2;
- echo $msg >&2;
+ echo "The following lines are greater than 80 characters long:" >&2;
+ echo >&2
+ echo "$msg" >&2;
quit $ERR_LENGTH;
fi
@@ -107,7 +119,19 @@ do
case $expect in
"header")
err=$ERR_HEADER;
- echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+ echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] .+$"
+ result=$?
+ if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+ then
+ # Don't be too strict.
+ # Commits may be temporary, intended to be squashed later.
+ # Just issue a warning here.
+ echo "Warning: heading should be a sentence beginning with a capital letter." 1>&2
+ echo "You entered:" 1>&2
+ echo "$line" 1>&2
+ fi
+ # restore exit code
+ (exit $result)
;;
"empty")
err=$ERR_EMPTY;
@@ -128,6 +152,10 @@ do
# Should not end up here
false
;;
+ "possibly-eof")
+ # Allow empty and/or comment lines at the end
+ ! tail -n +"$i" "$1" |grep -qvE '^($|#)'
+ ;;
"comment")
echo "$line" | grep -Eq "^#";
;;
@@ -188,7 +216,7 @@ do
in_description=1;
;;
"footer")
- expecting="footer eof";
+ expecting="footer possibly-eof";
if [ "$tickets" = "" ]
then
tickets="$line";
@@ -199,6 +227,9 @@ do
"comment")
# Comments should expect the same thing again
;;
+ "possibly-eof")
+ expecting="eof";
+ ;;
*)
echo "Unrecognised token $expect" >&2;
quit 254;
@@ -35,8 +35,8 @@ then
# Branch is prefixed with 'ticket/', append ticket ID to message
if [ "$branch" != "${branch##ticket/}" ];
then
- tail="\n\nPHPBB3-${branch##ticket/}";
+ tail="$(printf "\n\nPHPBB3-${branch##ticket/}")";
fi
- echo "[$branch]$tail $(cat "$1")" > "$1"
+ echo "[$branch] $tail$(cat "$1")" > "$1"
fi
Oops, something went wrong.

0 comments on commit c8da5ad

Please sign in to comment.