Merge pull request #10021 from dependabot/fix-docker-requirement-type

Fix Docker Requirement initializer type
dependabot · Jun 17, 2024 · 29f2831 · 29f2831
2 parents 11ce6b8 + 6f82dc7
commit 29f2831
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/docker/lib/dependabot/docker/requirement.rb b/docker/lib/dependabot/docker/requirement.rb
@@ -27,10 +27,10 @@ def satisfied_by?(version)
 
       # Patches Gem::Requirement to make it accept requirement strings like
       # "~> 4.2.5, >= 4.2.5.1" without first needing to split them.
-      sig { params(requirements: String).void }
+      sig { params(requirements: T.any(T.nilable(String), T::Array[T.nilable(String)])).void }
       def initialize(*requirements)
         requirements = requirements.flatten.flat_map do |req_string|
-          req_string.split(",").map(&:strip)
+          req_string.to_s.split(",").map(&:strip)
         end
 
         super(requirements)

diff --git a/docker/spec/dependabot/docker/requirement_spec.rb b/docker/spec/dependabot/docker/requirement_spec.rb
@@ -24,6 +24,12 @@
 
       it { is_expected.to eq(Gem::Requirement.new("> 20.8.1.alpine3.18", "< 20.9")) }
     end
+
+    context "with a collection of strings" do
+      let(:requirement_string) { [">= 1.0.0", "< 2.0.0"] }
+
+      it { is_expected.to eq(Gem::Requirement.new(">= 1.0.0", "< 2.0.0")) }
+    end
   end
 
   describe "#satisfied_by?" do