Remove extra references to composer v1

dependabot · Jan 8, 2025 · 2dbbd81 · 2dbbd81
1 parent be5f774
commit 2dbbd81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/composer/lib/dependabot/composer/file_updater/lockfile_updater.rb b/composer/lib/dependabot/composer/file_updater/lockfile_updater.rb
@@ -204,14 +204,6 @@ def handle_composer_errors(error)
             raise PrivateSourceAuthenticationFailure, source
           end
 
-          # NOTE: This error is raised by composer v1
-          if error.message.include?("Argument 1 passed to Composer")
-            msg = "One of your Composer plugins is not compatible with the " \
-                  "latest version of Composer. Please update Composer and " \
-                  "try running `composer update` to debug further."
-            raise DependencyFileNotResolvable, msg
-          end
-
           # NOTE: This error is raised by composer v2 and includes helpful
           # information about which plugins or dependencies are not compatible
           if error.message.include?("Your requirements could not be resolved")

diff --git a/composer/lib/dependabot/composer/update_checker/version_resolver.rb b/composer/lib/dependabot/composer/update_checker/version_resolver.rb
@@ -34,7 +34,6 @@ def initialize(extensions)
         MISSING_IMPLICIT_PLATFORM_REQ_REGEX =
           %r{
             (?<!with|for|by)\sext\-[^\s\/]+\s.*?\s(?=->)|
-            (?<=requires\s)php(?:\-[^\s\/]+)?\s.*?\s(?=->)| # composer v1
             (?<=require\s)php(?:\-[^\s\/]+)?\s.*?\s(?=->) # composer v2
           }x
         VERSION_REGEX = /[0-9]+(?:\.[A-Za-z0-9\-_]+)*/

diff --git a/composer/spec/dependabot/composer_spec.rb b/composer/spec/dependabot/composer_spec.rb
@@ -18,7 +18,7 @@
     # composer/helpers/v2/composer.lock, you also need to bump it in the
     # Dockerfile.
 
-    expect(helper_composer_version(major_version: "v2")).to eq(native_composer_version(major_version: "v2"))
+    expect(helper_composer_version(major_version: "v2")).to eq(native_composer_version)
   end
 
   private
@@ -30,12 +30,8 @@ def helper_composer_version(major_version:)
     JSON.parse(composer_lock)["packages"].find { |p| p["name"] == "composer/composer" }["version"]
   end
 
-  def native_composer_version(major_version:)
-    native_composer_output = if major_version == "v1"
-                               Dependabot::SharedHelpers.run_shell_command("composer1 --version")
-                             else
-                               Dependabot::SharedHelpers.run_shell_command("composer --version")
-                             end
+  def native_composer_version
+    native_composer_output = Dependabot::SharedHelpers.run_shell_command("composer --version")
     native_composer_output.match(/composer\s+version\s+(\d+\.\d+\.\d+)/i).captures.first
   end
 end