[BUGFIX] Don't call mergeRecursiveWithOverrule with null argument 19/59719/4
authorAlexander Schnitzler <git@alexanderschnitzler.de>
Mon, 18 Feb 2019 13:56:14 +0000 (14:56 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 23 Feb 2019 17:50:43 +0000 (18:50 +0100)
commit5a470bcbab6a4cf12bb1e1d7d50a3675bce72b26
tree8cc2215cf4aa1c3ee34e8258862ee1fb512dabb5
parent409a6e40c87a4d185dd3bd1b328ff5d4fb5cba63
[BUGFIX] Don't call mergeRecursiveWithOverrule with null argument

During the removal of deprecated code in Extbase, a bug has been
introduced which is fixed with this patch.

Releases: master
Resolves: #87732
Relates: #87269
Change-Id: I5739acf64c65ad5eb79bcf16c6e7962366af59f6
Reviewed-on: https://review.typo3.org/c/59719
Tested-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/extbase/Classes/Service/ExtensionService.php
typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php