Merge branch 'main' into robaiken/dont-suppress-composer-error

dependabot · May 8, 2024 · fc0b827 · fc0b827
2 parents b7ca065 + 9a32ecc
commit fc0b827
Show file tree

Hide file tree

Showing 23 changed files with 1,089 additions and 1,011 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,20 +1,20 @@
 PATH
   remote: bundler
   specs:
-    dependabot-bundler (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-bundler (0.255.0)
+      dependabot-common (= 0.255.0)
       parallel (~> 1.24)
 
 PATH
   remote: cargo
   specs:
-    dependabot-cargo (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-cargo (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: common
   specs:
-    dependabot-common (0.254.0)
+    dependabot-common (0.255.0)
       aws-sdk-codecommit (~> 1.28)
       aws-sdk-ecr (~> 1.5)
       bundler (>= 1.16, < 3.0.0)
@@ -37,107 +37,107 @@ PATH
 PATH
   remote: composer
   specs:
-    dependabot-composer (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-composer (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: devcontainers
   specs:
-    dependabot-devcontainers (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-devcontainers (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: docker
   specs:
-    dependabot-docker (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-docker (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: elm
   specs:
-    dependabot-elm (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-elm (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: git_submodules
   specs:
-    dependabot-git_submodules (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-git_submodules (0.255.0)
+      dependabot-common (= 0.255.0)
       parseconfig (~> 1.0, < 1.1.0)
 
 PATH
   remote: github_actions
   specs:
-    dependabot-github_actions (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-github_actions (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: go_modules
   specs:
-    dependabot-go_modules (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-go_modules (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: gradle
   specs:
-    dependabot-gradle (0.254.0)
-      dependabot-common (= 0.254.0)
-      dependabot-maven (= 0.254.0)
+    dependabot-gradle (0.255.0)
+      dependabot-common (= 0.255.0)
+      dependabot-maven (= 0.255.0)
 
 PATH
   remote: hex
   specs:
-    dependabot-hex (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-hex (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: maven
   specs:
-    dependabot-maven (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-maven (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: npm_and_yarn
   specs:
-    dependabot-npm_and_yarn (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-npm_and_yarn (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: nuget
   specs:
-    dependabot-nuget (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-nuget (0.255.0)
+      dependabot-common (= 0.255.0)
       rubyzip (>= 2.3.2, < 3.0)
 
 PATH
   remote: pub
   specs:
-    dependabot-pub (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-pub (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: python
   specs:
-    dependabot-python (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-python (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: silent
   specs:
-    dependabot-silent (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-silent (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: swift
   specs:
-    dependabot-swift (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-swift (0.255.0)
+      dependabot-common (= 0.255.0)
 
 PATH
   remote: terraform
   specs:
-    dependabot-terraform (0.254.0)
-      dependabot-common (= 0.254.0)
+    dependabot-terraform (0.255.0)
+      dependabot-common (= 0.255.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/bundler/lib/dependabot/bundler/file_updater/ruby_requirement_setter.rb b/bundler/lib/dependabot/bundler/file_updater/ruby_requirement_setter.rb
@@ -12,7 +12,7 @@ class RubyRequirementSetter
         class RubyVersionNotFound < StandardError; end
 
         RUBY_VERSIONS = %w(
-          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.4 3.2.2 3.3.0
+          1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.4 3.2.2 3.3.1
         ).freeze
 
         attr_reader :gemspec

diff --git a/bundler/spec/dependabot/bundler/file_updater/ruby_requirement_setter_spec.rb b/bundler/spec/dependabot/bundler/file_updater/ruby_requirement_setter_spec.rb
@@ -133,7 +133,7 @@
         let(:content) do
           bundler_project_dependency_file("gemfile", filename: "Gemfile").content
         end
-        it { is_expected.to include("ruby '3.3.0'\n") }
+        it { is_expected.to include("ruby '3.3.1'\n") }
         it { is_expected.to include(%(gem "business", "~> 1.4.0")) }
       end
 

diff --git a/bundler/spec/fixtures/projects/bundler1/gemfile_require_ruby_3_3/example.gemspec b/bundler/spec/fixtures/projects/bundler1/gemfile_require_ruby_3_3/example.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files        = Dir["CHANGELOG.md", "LICENSE.txt", "README.md",
                           "lib/**/*", "helpers/**/*"]
 
-  spec.required_ruby_version = ">= 3.3.0"
+  spec.required_ruby_version = ">= 3.3.1"
   spec.required_rubygems_version = ">= 2.6.11"
 
   spec.add_dependency 'business', '~> 1.0'

diff --git a/bundler/spec/fixtures/projects/bundler2/gemfile_require_ruby_3_3/example.gemspec b/bundler/spec/fixtures/projects/bundler2/gemfile_require_ruby_3_3/example.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files        = Dir["CHANGELOG.md", "LICENSE.txt", "README.md",
                           "lib/**/*", "helpers/**/*"]
 
-  spec.required_ruby_version = ">= 3.3.0"
+  spec.required_ruby_version = ">= 3.3.1"
   spec.required_rubygems_version = ">= 3.5.3"
 
   spec.add_dependency 'business', '~> 1.0'

diff --git a/cargo/Dockerfile b/cargo/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.77.2-bookworm as rust
+FROM docker.io/library/rust:1.78.0-bookworm as rust
 
 FROM ghcr.io/dependabot/dependabot-updater-core
 

diff --git a/common/lib/dependabot.rb b/common/lib/dependabot.rb
@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.254.0"
+  VERSION = "0.255.0"
 end
diff --git a/composer/lib/dependabot/composer/file_parser.rb b/composer/lib/dependabot/composer/file_parser.rb
@@ -166,7 +166,7 @@ def git_dependency_details(package_details, requirement)
 
       def lockfile_details(name:, type:)
         key = lockfile_key(type)
-        parsed_lockfile.fetch(key, []).find { |d| d["name"] == name }
+        parsed_lockfile.fetch(key, [])&.find { |d| d["name"] == name }
       end
 
       def lockfile_key(type)

diff --git a/composer/spec/dependabot/composer/file_parser_spec.rb b/composer/spec/dependabot/composer/file_parser_spec.rb
@@ -49,6 +49,16 @@
       end
     end
 
+    context "null dependencies with lockfile" do
+      let(:project_name) { "null_dependencies_with_lockfile" }
+      let(:name) { "phpunit/phpunit" }
+      let(:type) { "development" }
+      describe "no dependencies" do
+        subject { dependencies }
+        its(:length) { is_expected.to be >= 0 }
+      end
+    end
+
     context "with a version specified (composer v1)" do
       let(:project_name) { "v1/minor_version" }
 

diff --git a/composer/spec/fixtures/projects/null_dependencies_with_lockfile/composer.json b/composer/spec/fixtures/projects/null_dependencies_with_lockfile/composer.json
@@ -0,0 +1,41 @@
+{
+    "name": "joshuaestes/server-tools",
+    "description": "Collection of command line tools to help with server management and maintenance",
+    "keywords": [],
+    "homepage": "https://github.com/JoshuaEstes/ServerTools",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Joshua Estes",
+            "homepage": "http://joshuaestes.me"
+        },
+        {
+            "name": "Contributors",
+            "homepage": "https://github.com/JoshuaEstes/ServerTools/graphs/contributors"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.3.2",
+        "symfony/console": ">=2.1,<=2.3@dev",
+        "symfony/process": ">=2.1,<=2.3@dev",
+        "symfony/yaml": ">=2.1,<=2.3@dev",
+        "symfony/finder": ">=2.1,<=2.3@dev",
+        "symfony/filesystem": ">=2.1,<=2.3@dev"
+    },
+    "replace": {
+        "JoshuaEstes/ServerTools": "self.version"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*",
+        "mikey179/vfsStream": "*"
+    },
+    "autoload": {
+        "psr-0": { "": "src/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0-dev"
+        }
+    }
+}