Attached patch fixes what I am sure is a simple typographical error:

--- a/includes/install.inc
+++ b/includes/install.inc
@@ -1183,9 +1183,9 @@ function drupal_check_module($module) {
  *    dependencies[] = dblog
  * @endcode
  *
- * @param profile
+ * @param $profile
  *   Name of profile.
- * @param locale
+ * @param $locale
  *   Name of locale used (if any).
  * @return
  *   The info array.
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Lars Toomre’s picture

While you are in there, could you add a blank line before the @return doc statements? Thanks.

pillarsdotnet’s picture

Lars Toomre’s picture

While reviewing the larger resulting patch, I see that drupal_verify_install_file() and drupal_install_mkdir() docblocks also have some indentation issues. The text below @param and @return directives should be two spaces. Since this is a documentation only patch, these probably should be cleaned up as well. Thanks.

pillarsdotnet’s picture

pillarsdotnet’s picture

OMG I just noticed this horrible travesty:

  * @return
- *  TRUE/FALSE whether or not the directory was successfully created.
+ *   TRUE/FALSE whether or not the directory was successfully created.
  */
 function drupal_install_mkdir($file, $mask, $message = TRUE) {

Must...fight...scope...creep...ARRRRGGGGHHHHH!!!!!!

I give up; re-rolled.

Lars Toomre’s picture

Status: Needs review » Reviewed & tested by the community

Thank you @pillarsdotnet. All of these changes look good to go and bring these docblocks closer to drupal documentation standards.

Edit: Assuming testbots return all green...

jhodgdon’s picture

Status: Reviewed & tested by the community » Needs work

Can you PLEASE limit your changes to the doc of the function mentioned in the issue statement? Cleaning up a whole file like this , AS YOU WELL KNOW pillarsdotnet, is not OK at this time.

Lars Toomre’s picture

I have no idea if this is cleaning up the whole underlying file. It is simply cleaning up the docblocks touched by the original issue and my suggestion to insert missing blank lines before @return doc statements.

What is wrong with getting this committed? Should not documentation-only patches correct noticed variations from documentation standards? I am at a loss as to why this now 'needs work'.

pillarsdotnet’s picture

Status: Needs work » Needs review
FileSize
419 bytes

Whatever. Re-uploading the original patch. Y'all feel free to continue arguing amongst yourselves.

jhodgdon’s picture

Status: Needs review » Needs work

This issue covers *one* function. Please just fix up the one function, and make it comply with doc standards, not the whole file?

pillarsdotnet’s picture

Status: Needs work » Needs review
FileSize
430 bytes

Fine, but when I submit separate patches for each of the other functions, both you and webchick will complain. She's already complained about the fact that I submitted separate patches for separate files as I found similar problems in each.

I really wish y'all would reach a consensus on these things. And publish it somewhere so I can re-read it when I forget.

jhodgdon’s picture

Status: Needs review » Reviewed & tested by the community

Here is my take on your meta-question of what to patch when:

a) Patches that do small standards updates to a whole file or to most of a file would tend to make it so that other patches in the queue cannot be applied, if they are not committed. So they can only be committed when the committers are receptive to such patches, such as the first week in November when every D8 patch in the queue is going to break anyway because the core files are being moved into a 'core' directory.

b) Patches that fix the same real issue in about 10 functions are not as disruptive, and are easier to review and commit than 10 smaller patches fixing the same real issue in the 10 functions separately.

c) When you are fixing up a docblock for one function, any patches around that area in the file would already be disrupted. So if there is one doc problem in a function doc, it's not more disruptive to, at the same time, fix up the rest of the doc problems in that one function at the same time, and it also doesn't make the patch much more time consuming to review or commit. So I advocate fixing up each function to comply with our current doc standards whenever a doc problem is being fixed for that function.

Does that make any kind of sense to you? I think it is pretty much common sense (you can get webchick, Dries, or catch to chime in and see if it makes sense to them too)... And if you have a good idea of where to publish it, I would be happy to write it up more formally. I don't think it belongs in coding standards... any thoughts on where it should go?

Anyway, the current patch on #11 should be fine for d7/8. Thanks!

pillarsdotnet’s picture

Status: Fixed » Reviewed & tested by the community

any thoughts on where it should go?

Either:

  • Drupal patches
    Explain how to create/submit a patch that is not too disruptive.

Or:

  • Patch review
    Explain how to judge whether a patch should be marked "needs work" because it should be broken into two or more smaller patches.

Or possibly as a sub-page of one or both titled:

  • Patch scope
    How much should I change in a single patch?

Seriously, without a written standard somewhere, I'm going to keep overreacting every time I receive contradictory instructions from two different developers who both outrank me.

jhodgdon’s picture

Good idea. Further discussion should go on this issue (which I filed to make sure this proposed page gets created):
#1298194: Standard needed for what is a "disruptive" patch

webchick’s picture

Status: Reviewed & tested by the community » Fixed

Committed and pushed to 8.x and 7.x.

Status: Reviewed & tested by the community » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.