#118 | Use syncHelper to ensure package install complete

Author: Leander Huysse

src/Compatibility/Executor.php

@@ -5,6 +5,10 @@
  */
 namespace Vaimo\ComposerPatches\Compatibility;
 
+use Composer\Composer;
+use Composer\Util\SyncHelper;
+use React\Promise\Promise;
+use Vaimo\ComposerPatches\Exceptions\OperationFailure;
 use Vaimo\ComposerPatches\Patch\Definition as PatchDefinition;
 use Composer\Repository\WritableRepositoryInterface;
 use Composer\DependencyResolver\Operation\InstallOperation;
@@ -76,7 +80,8 @@ public function processReinstallOperation(
         WritableRepositoryInterface $repository,
         InstallationManager $installationManager,
         InstallOperation $installOperation,
-        UninstallOperation $uninstallOperation
+        UninstallOperation $uninstallOperation,
+        Composer $composer
     ) {
         if (version_compare(\Composer\Composer::VERSION, '2.0', '<')) {
             return $installationManager->install($repository, $installOperation);
@@ -85,12 +90,18 @@ public function processReinstallOperation(
         $package = $installOperation->getPackage();
         $installer = $installationManager->getInstaller($package->getType());
 
-        $installationManager->uninstall($repository, $uninstallOperation);
+        $promise = $installationManager->uninstall($repository, $uninstallOperation);
+        if (!$promise instanceof Promise) {
+            throw new OperationFailure("Uninstallation of {$package->getName()} failed");
+        }
 
-        return $installer
-            ->download($package)
-            ->then(function () use ($installationManager, $installOperation, $repository) {
-                $installationManager->install($repository, $installOperation);
-            });
+        return $promise->then(static function () use ($composer, $installer, $package) {
+            return SyncHelper::downloadAndInstallPackageSync(
+                $composer->getLoop(),
+                $composer->getDownloadManager(),
+                $installer->getInstallPath($package),
+                $package
+            );
+        });
     }
 }

src/Managers/RepositoryManager.php

@@ -5,6 +5,7 @@
  */
 namespace Vaimo\ComposerPatches\Managers;
 
+use Composer\Composer;
 use Composer\Repository\WritableRepositoryInterface;
 use Composer\Package\PackageInterface;
 use Composer\DependencyResolver\Operation\UninstallOperation;
@@ -56,8 +57,11 @@ public function __construct(
      * @param PackageInterface $package
      * @throws \Vaimo\ComposerPatches\Exceptions\PackageResetException
      */
-    public function resetPackage(WritableRepositoryInterface $repository, PackageInterface $package)
-    {
+    public function resetPackage(
+        WritableRepositoryInterface $repository,
+        PackageInterface $package,
+        Composer $composer
+    ) {
         $resetOperation = new ResetOperation($package, 'Package reset due to changes in patches configuration');
         $uninstallOperation = new UninstallOperation($package);
 
@@ -70,8 +74,8 @@ public function resetPackage(WritableRepositoryInterface $repository, PackageInt
         $compExecutor = $this->compExecutor;
         $installationManager = $this->installationManager;
         return $this->consoleSilencer->applyToCallback(
-            function () use ($compExecutor, $installationManager, $repository, $resetOperation, $uninstallOperation) {
-                return $compExecutor->processReinstallOperation($repository, $installationManager, $resetOperation, $uninstallOperation);
+            function () use ($compExecutor, $installationManager, $repository, $resetOperation, $uninstallOperation, $composer) {
+                return $compExecutor->processReinstallOperation($repository, $installationManager, $resetOperation, $uninstallOperation, $composer);
             }
         );
     }

src/Repository/PatchesApplier.php

@@ -195,7 +195,7 @@ public function apply(Repository $repository, array $patches)
                     );
                 }
 
-                $resets[] = $this->repositoryManager->resetPackage($repository, $resetTarget);
+                $resets[] = $this->repositoryManager->resetPackage($repository, $resetTarget, $this->composer);
             }
 
             $this->compExecutor->waitForCompletion($this->composer, $resets);