>>> $a = ['hello' => []];
=> [
       "hello" => []
   ]
>>> $b = ['hello' => [1, 2, 3]];
=> [
       "hello" => [
           1,
           2,
           3
       ]
   ]
>>> $a + $b;
=> [
       "hello" => []
   ]
>>> array_merge($a, $b);
=> [
       "hello" => [
           1,
           2,
           3
       ]
   ]

As written, I think this is not correct, since array_merge($a + $b) should be the same as $a + $b. You probably want array_merge($a, $b) (that is, $..., $..., not $... + $...)

array_merge() has surprising behavior when arrays contain numeric keys. I'd prefer this continue to use +, but be restructured something like this:

$dict = array(...);
$authorship = ...
$defaults = array('properties' => array());

return $dict + $authorship + $defaults;

Or just make getDiffAuthorshipDict() always return a (possibly empty) properties, and remove it from $dict.

This revision now requires changes to proceed.Apr 14 2016, 3:04 PM

Fix both left hands to become one left and one right.

epriestley accepted this revision.Apr 15 2016, 1:30 PM

epriestley edited edge metadata.

This revision is now accepted and ready to land.Apr 15 2016, 1:30 PM

Thanks! I added you to Blessed Committers so you should be able to land this (or "Land Revision") this yourself. See that project page for some instructions if you run into trouble.

(I also added you to Community, so you have a broader range of editing powers now.)

Closed by commit rPf05c3e41b9c4: Fixed localcommits include on getDiffDict (authored by Povilas Balzaravicius Pawka <povilas@uber.com>). · Explain WhyApr 15 2016, 3:06 PM

This revision was automatically updated to reflect the committed changes.

epriestley mentioned this in T10808: differential.querydiffs method does not provide "local:commits".May 22 2016, 1:11 PM