dependabot-composer 0.171.0 → 0.171.4

data/helpers/v2/src/UpdateChecker.php

@@ -8,7 +8,6 @@ use Composer\DependencyResolver\Request;
 use Composer\Factory;
 use Composer\Installer;
 use Composer\Package\PackageInterface;
-use Composer\Util\Filesystem;
 
 final class UpdateChecker
 {
@@ -48,15 +47,6 @@ final class UpdateChecker
             $io->loadConfiguration($config);
         }
 
-        $installationManager = new DependabotInstallationManager($composer->getLoop(), $io);
-
-        $fs = new Filesystem(null);
-        $binaryInstaller = new Installer\BinaryInstaller($io, rtrim($composer->getConfig()->get('bin-dir'), '/'), $composer->getConfig()->get('bin-compat'), $fs);
-
-        $installationManager->addInstaller(new Installer\LibraryInstaller($io, $composer, null, $fs, $binaryInstaller));
-        $installationManager->addInstaller(new Installer\PluginInstaller($io, $composer, $fs, $binaryInstaller));
-        $installationManager->addInstaller(new Installer\MetapackageInstaller($io));
-
         $install = new Installer(
             $io,
             $config,
@@ -64,7 +54,7 @@ final class UpdateChecker
             $composer->getDownloadManager(),
             $composer->getRepositoryManager(),
             $composer->getLocker(),
-            $installationManager,
+            $composer->getInstallationManager(),
             $composer->getEventDispatcher(),
             $composer->getAutoloadGenerator()
         );
@@ -72,6 +62,7 @@ final class UpdateChecker
         // For all potential options, see UpdateCommand in composer
         $install
             ->setUpdate(true)
+            ->setInstall(false)
             ->setDevMode(true)
             ->setUpdateAllowTransitiveDependencies(Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS)
             ->setDumpAutoloader(false)
@@ -86,7 +77,7 @@ final class UpdateChecker
 
         $install->run();
 
-        $installedPackages = $installationManager->getInstalledPackages();
+        $installedPackages = $composer->getLocker()->getLockedRepository(true)->getPackages();
 
         $updatedPackage = current(array_filter($installedPackages, static function (PackageInterface $package) use ($dependencyName): bool {
             return $package->getName() === $dependencyName;

data/helpers/v2/src/Updater.php

@@ -78,6 +78,7 @@ final class Updater
         $install
             ->setWriteLock(true)
             ->setUpdate(true)
+            ->setInstall(false)
             ->setDevMode(true)
             ->setUpdateAllowList([$dependencyName])
             ->setUpdateAllowTransitiveDependencies(Request::UPDATE_LISTED_WITH_TRANSITIVE_DEPS)

data/lib/dependabot/composer/update_checker/version_resolver.rb

@@ -250,10 +250,10 @@ module Dependabot
 
           if error.message.match?(FAILED_GIT_CLONE_WITH_MIRROR)
             dependency_url = error.message.match(FAILED_GIT_CLONE_WITH_MIRROR).named_captures.fetch("url")
-            raise Dependabot::GitDependenciesNotReachable, dependency_url
+            raise Dependabot::GitDependenciesNotReachable, clean_dependency_url(dependency_url)
           elsif error.message.match?(FAILED_GIT_CLONE)
             dependency_url = error.message.match(FAILED_GIT_CLONE).named_captures.fetch("url")
-            raise Dependabot::GitDependenciesNotReachable, dependency_url
+            raise Dependabot::GitDependenciesNotReachable, clean_dependency_url(dependency_url)
           elsif unresolvable_error?(error)
             raise Dependabot::DependencyFileNotResolvable, sanitized_message
           elsif error.message.match?(MISSING_EXPLICIT_PLATFORM_REQ_REGEX)
@@ -463,6 +463,15 @@ module Dependabot
           platform
         end
 
+        def clean_dependency_url(dependency_url)
+          return dependency_url unless URI::DEFAULT_PARSER.regexp[:ABS_URI].match?(dependency_url)
+
+          url = URI.parse(dependency_url)
+          url.user = nil
+          url.password = nil
+          url.to_s
+        end
+
         def parsed_composer_file
           @parsed_composer_file ||= JSON.parse(composer_file.content)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.171.0
+  version: 0.171.4
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.171.0
+        version: 0.171.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.171.0
+        version: 0.171.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,6 @@ files:
 - helpers/v2/composer.json
 - helpers/v2/composer.lock
 - helpers/v2/phpstan.neon
-- helpers/v2/src/DependabotInstallationManager.php
 - helpers/v2/src/DependabotPluginManager.php
 - helpers/v2/src/ExceptionIO.php
 - helpers/v2/src/Hasher.php

data/helpers/v2/src/DependabotInstallationManager.php

@@ -1,74 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Dependabot\Composer;
-
-use Composer\DependencyResolver\Operation\InstallOperation;
-use Composer\DependencyResolver\Operation\UninstallOperation;
-use Composer\DependencyResolver\Operation\UpdateOperation;
-use Composer\Installer\InstallationManager;
-use Composer\Package\PackageInterface;
-use Composer\Repository\InstalledRepositoryInterface;
-use React\Promise\PromiseInterface;
-
-final class DependabotInstallationManager extends InstallationManager
-{
-    private array $installed = [];
-    private array $updated = [];
-    private array $uninstalled = [];
-
-    public function execute(InstalledRepositoryInterface $repo, array $operations, $devMode = true, $runScripts = true): void
-    {
-        foreach ($operations as $operation) {
-            $method = $operation->getOperationType();
-            // NOTE: skipping download() step
-            $this->$method($repo, $operation);
-        }
-    }
-
-    public function install(InstalledRepositoryInterface $repo, InstallOperation $operation): ?PromiseInterface
-    {
-        $this->installed[] = $operation->getPackage();
-
-        return null;
-    }
-
-    public function update(InstalledRepositoryInterface $repo, UpdateOperation $operation): ?PromiseInterface
-    {
-        $this->updated[] = [$operation->getInitialPackage(), $operation->getTargetPackage()];
-
-        return null;
-    }
-
-    public function uninstall(InstalledRepositoryInterface $repo, UninstallOperation $operation): ?PromiseInterface
-    {
-        $this->uninstalled[] = $operation->getPackage();
-
-        return null;
-    }
-
-    /**
-     * @return PackageInterface[]
-     */
-    public function getInstalledPackages(): array
-    {
-        return $this->installed;
-    }
-
-    /**
-     * @return PackageInterface[]
-     */
-    public function getUpdatedPackages(): array
-    {
-        return $this->updated;
-    }
-
-    /**
-     * @return PackageInterface[]
-     */
-    public function getUninstalledPackages(): array
-    {
-        return $this->uninstalled;
-    }
-}