[BUGFIX] Ignore autoload-dev if provided in composer.json 54/43954/2
authorHelmut Hummel <helmut.hummel@typo3.org>
Fri, 9 Oct 2015 21:04:18 +0000 (23:04 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Fri, 9 Oct 2015 21:24:34 +0000 (23:24 +0200)
Resolves: #70557
Releases: master
Change-Id: Ie1a7f7fb1e9de48e6e0d65ddf2be398d65101ddc
Reviewed-on: http://review.typo3.org/43954
Reviewed-by: Sascha Egerer <sascha@sascha-egerer.de>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/core/Classes/Package/PackageManager.php

index 933c3fb..10d7069 100644 (file)
@@ -1039,6 +1039,8 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
         if (isset($extensionManagerConfiguration['autoload'])) {
             $composerManifest->autoload = json_decode(json_encode($extensionManagerConfiguration['autoload']));
         }
+        // composer.json autoload-dev information must be discarded, as it may contain information only available after a composer install
+        unset($composerManifest->{'autoload-dev'});
         if (isset($extensionManagerConfiguration['autoload-dev'])) {
             $composerManifest->{'autoload-dev'} = json_decode(json_encode($extensionManagerConfiguration['autoload-dev']));
         }