* upstream/develop: (196 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/includes/functions.php
tests/cache/cache_test.php
* dhruvgoel92/ticket/11051:
[ticket/11051] fix spaces
[ticket/11051] add common_words variable
[ticket/11051] remove unnecessary comment
[ticket/11051] add get_word_len() in sphinx search
[ticket/11051] use get_word_length in search backend
[ticket/11051] use get_common_words in search backend
[ticket/11051] function instead of accessing property in search
[ticket/11051] add public functions for public properties
* dhruvgoel92/ticket/11048:
[ticket/11048] use protected instead of private in pgsql fulltext
[ticket/11048] use protected instead of private in native search
[ticket/11048] remove @access from all docblocks
[ticket/11048] use protected instead of private in mysql fulltext
[ticket/11048] use protected instead of private in sphinx
[ticket/11048] add access specifiers to phpbb native search properties
[ticket/11048] add access specifiers to sphinx search
[ticket/11048] add access specifiers to phpbb native search
[ticket/11048] add access specifiers to mysql search
[ticket/11048] add access specifiers to pgsql search
* dhruvgoel92/ticket/11011:
[ticket/11011] rename property phpEx to php_ext
[ticket/11011] pass $auth to search backend constructor
[ticket/11011] remove global keyword from sphinx
[ticket/11011] pass global variables in construct
[ticket/11011] passing global variables
[ticket/11011] remove global keyword in native search
[ticket/11011] remove global keyword in pgsql search
[ticket/11011] global variables as constructor parameters
[ticket/11011] add access specifiers and docblocks