Merge pull request #110 from TYPO3GmbH/bugfix/update-composer-2-1.5.x

Author: helhum

src/Installer/ExtensionInstaller.php

@@ -196,10 +196,11 @@ public function update(InstalledRepositoryInterface $repo, PackageInterface $ini
         if ($promise instanceof PromiseInterface) {
             $binaryInstaller = $this->binaryInstaller;
             $installPath = $this->getInstallPath($target);
-            return $promise->then(function () use ($binaryInstaller, $installPath, $package, $repo) {
-                $binaryInstaller->installBinaries($package, $installPath);
-                if (!$repo->hasPackage($package)) {
-                    $repo->addPackage(clone $package);
+            return $promise->then(function () use ($binaryInstaller, $installPath, $target, $initial, $repo) {
+                $binaryInstaller->installBinaries($target, $installPath);
+                $repo->removePackage($initial);
+                if (!$repo->hasPackage($target)) {
+                    $repo->addPackage(clone $target);
                 }
             });
         }

tests/Installer/ExtensionInstallerTest.php

@@ -15,7 +15,9 @@
 
 namespace TYPO3\CMS\ComposerTest\Installer;
 
+use Composer\Composer;
 use Composer\Package\Package;
+use TYPO3\CMS\Composer\Plugin\Util\Filesystem as TYPO3Filesystem;
 
 class ExtensionInstallerTest extends InstallerTestCase
 {
@@ -96,4 +98,64 @@ public function extensionInstallPathDataProvider()
             ],
         ];
     }
+
+    public function testUpdate()
+    {
+        $filesystem = $this->getMockBuilder(TYPO3Filesystem::class)
+            ->getMock();
+        $filesystem
+            ->expects($this->once())
+            ->method('rename')
+            ->with('/typo3conf/ext/old', '/typo3conf/ext/new');
+
+        /** @var Package $package */
+        $initial = $this->createPackage('somevendor/somepackage-extension', 'typo3-cms-extension');
+        $initial->setExtra([
+            'typo3/cms' => [
+                'extension-key' => 'old',
+            ],
+        ]);
+
+        /** @var Package $package */
+        $target = $this->createPackage('somevendor/somepackage-extension', 'typo3-cms-extension');
+        $target->setExtra([
+            'typo3/cms' => [
+                'extension-key' => 'new',
+            ],
+        ]);
+
+        $this->repository
+            ->expects($this->exactly(3))
+            ->method('hasPackage')
+            ->will($this->onConsecutiveCalls(true, false, false));
+
+        if (!defined('Composer\Composer::RUNTIME_API_VERSION') || version_compare(Composer::RUNTIME_API_VERSION, '2.0.0') < 0) {
+            $this->downloadManager
+                ->expects($this->once())
+                ->method('update')
+                ->with($initial, $target, '/typo3conf/ext/new');
+        } else {
+            $this->downloadManager
+                ->expects($this->once())
+                ->method('update')
+                ->with($initial, $target, '/typo3conf/ext/new')
+                ->will($this->returnValue(\React\Promise\resolve()));
+        }
+
+        $this->repository
+            ->expects($this->once())
+            ->method('removePackage')
+            ->with($initial);
+
+        $this->repository
+            ->expects($this->once())
+            ->method('addPackage')
+            ->with($target);
+
+        $installer = $this->createExtensionInstaller($filesystem);
+        $installer->update($this->repository, $initial, $target);
+
+        $this->setExpectedException('InvalidArgumentException');
+        $installer->update($this->repository, $initial, $target);
+    }
 }

tests/Installer/InstallerTestCase.php

@@ -29,6 +29,7 @@
 use TYPO3\CMS\Composer\Installer\CoreInstaller;
 use TYPO3\CMS\Composer\Installer\ExtensionInstaller;
 use TYPO3\CMS\Composer\Plugin\Config as TYPO3Config;
+use TYPO3\CMS\Composer\Plugin\Util\Filesystem as TYPO3Filesystem;
 use TYPO3\CMS\ComposerTest\TestCase;
 
 class InstallerTestCase extends TestCase
@@ -53,6 +54,11 @@ class InstallerTestCase extends TestCase
      */
     protected $composer;
 
+    /**
+     * DownloadManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $downloadManager;
+
     /**
      * @var InstalledRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -77,8 +83,8 @@ protected function setUp()
         $this->composer->setInstallationManager($installationManager);
 
         /** @var DownloadManager */
-        $downloadManager = $this->getMockBuilder(DownloadManager::class)->disableOriginalConstructor()->getMock();
-        $this->composer->setDownloadManager($downloadManager);
+        $this->downloadManager = $this->getMockBuilder(DownloadManager::class)->disableOriginalConstructor()->getMock();
+        $this->composer->setDownloadManager($this->downloadManager);
 
         /** @var RootPackage|\PHPUnit_Framework_MockObject_MockObject $package */
         $package = $this->createMock(RootPackageInterface::class);
@@ -123,11 +129,12 @@ protected function createCoreInstaller()
     }
 
     /**
+     * @param null|mixed $filesystem
      * @return InstallerInterface
      */
-    protected function createExtensionInstaller()
+    protected function createExtensionInstaller($filesystem = null)
     {
-        $filesystem = new \TYPO3\CMS\Composer\Plugin\Util\Filesystem();
+        $filesystem = $filesystem ?? new TYPO3Filesystem();
         $binaryInstaller = new BinaryInstaller($this->io, rtrim($this->composer->getConfig()->get('bin-dir'), '/'), $this->composer->getConfig()->get('bin-compat'), $filesystem);
         $config = TYPO3Config::load($this->composer);
         return new ExtensionInstaller($this->io, $this->composer, $filesystem, $config, $binaryInstaller);