everzet/capifony — pull request #237 by fotakis (2012-09-27 08:37:19+00:00)
Title: More flexible deep merge method for symfony1

The deep merge method takes some things into assumption which it shouldn't.

The first is the fact that the 'all' keys will be present which is not the case. The second is the order of the values hash1 and hash2, these can easily be inversed by the callee.

There fore some simple checks may help determine if there is only a single value in either case, and if not we move down to the merge.

The merge occurs only if "both" are not null.