[pull] main from Homebrew:main

Library/Homebrew/Gemfile.lock

@@ -19,7 +19,7 @@ GEM
     erubi (1.13.1)
     hana (1.3.7)
     io-console (0.8.2)
-    json (2.19.9)
+    json (2.20.0)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -89,7 +89,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.87.0)
+    rubocop (1.88.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -140,15 +140,15 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
-    sorbet (0.6.13296)
-      sorbet-static (= 0.6.13296)
-    sorbet-runtime (0.6.13296)
-    sorbet-static (0.6.13296-aarch64-linux)
-    sorbet-static (0.6.13296-universal-darwin)
-    sorbet-static (0.6.13296-x86_64-linux)
-    sorbet-static-and-runtime (0.6.13296)
-      sorbet (= 0.6.13296)
-      sorbet-runtime (= 0.6.13296)
+    sorbet (0.6.13308)
+      sorbet-static (= 0.6.13308)
+    sorbet-runtime (0.6.13308)
+    sorbet-static (0.6.13308-aarch64-linux)
+    sorbet-static (0.6.13308-universal-darwin)
+    sorbet-static (0.6.13308-x86_64-linux)
+    sorbet-static-and-runtime (0.6.13308)
+      sorbet (= 0.6.13308)
+      sorbet-runtime (= 0.6.13308)
     spoom (1.7.16)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)

Library/Homebrew/cmd/update_report/reporter.rb

@@ -253,7 +253,7 @@ def migrate_tap_migration
 
         ohai "Installing #{new_name}..."
         begin
-          system HOMEBREW_BREW_FILE, "install", "--overwrite", new_full_name
+          system HOMEBREW_BREW_FILE.to_s, "install", "--overwrite", new_full_name
         # Rescue any possible exception types.
         rescue Exception => e # rubocop:disable Lint/RescueException
           if Homebrew::EnvConfig.developer?
@@ -281,11 +281,11 @@ def migrate_tap_migration
         if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
           ohai migration_message
           ohai "brew unlink #{name}"
-          system HOMEBREW_BREW_FILE, "unlink", name
+          system HOMEBREW_BREW_FILE.to_s, "unlink", name
           ohai "brew cleanup"
-          system HOMEBREW_BREW_FILE, "cleanup"
+          system HOMEBREW_BREW_FILE.to_s, "cleanup"
           ohai "brew install --cask #{new_full_name}"
-          system HOMEBREW_BREW_FILE, "install", "--cask", new_full_name
+          system HOMEBREW_BREW_FILE.to_s, "install", "--cask", new_full_name
           ohai migration_message, <<~EOS
             The existing keg has been unlinked.
             Please uninstall the formula when convenient by running:

Library/Homebrew/dev-cmd/bump-cask-pr.rb

@@ -519,7 +519,7 @@ def run_cask_audit(cask, old_contents, audit_exceptions = [])
         if args.no_audit?
           ohai "Skipping `brew audit`"
         else
-          system HOMEBREW_BREW_FILE, "audit", "--cask", "--online", cask.full_name,
+          system HOMEBREW_BREW_FILE.to_s, "audit", "--cask", "--online", cask.full_name,
                  "--except=#{audit_exceptions.join(",")}"
           failed_audit = !$CHILD_STATUS.success?
         end
@@ -549,7 +549,7 @@ def run_cask_style(cask, old_contents)
         if args.no_style?
           ohai "Skipping `brew style --fix`"
         else
-          system HOMEBREW_BREW_FILE, "style", "--fix", sourcefile_path.to_s
+          system HOMEBREW_BREW_FILE.to_s, "style", "--fix", sourcefile_path.to_s
           failed_style = !$CHILD_STATUS.success?
         end
         return unless failed_style

Library/Homebrew/dev-cmd/bump-formula-pr.rb

@@ -812,10 +812,10 @@ def run_audit(formula, alias_rename, skip_synced_versions: false)
         if args.no_audit?
           ohai "Skipping `brew audit`"
         elsif audit_args.present?
-          system HOMEBREW_BREW_FILE, "audit", *audit_args, formula.full_name
+          system HOMEBREW_BREW_FILE.to_s, "audit", *audit_args, formula.full_name
           failed_audit = !$CHILD_STATUS.success?
         else
-          system HOMEBREW_BREW_FILE, "audit", formula.full_name
+          system HOMEBREW_BREW_FILE.to_s, "audit", formula.full_name
           failed_audit = !$CHILD_STATUS.success?
         end
         failed_audit

Library/Homebrew/extend/os/linux/sandbox.rb

@@ -252,7 +252,7 @@ def configure!
           end
 
           ohai "Configuring Bubblewrap..."
-          command = [HOMEBREW_BREW_FILE, "setup-sandbox"]
+          command = [HOMEBREW_BREW_FILE.to_s, "setup-sandbox"]
           command.unshift("sudo") unless Process.euid.zero?
           raise ErrorDuringExecution.new(command, status: $CHILD_STATUS || 1) unless system(*command)
 

Library/Homebrew/homebrew.rb

@@ -68,7 +68,7 @@ def self._system(cmd, argv0 = nil, *args, **options, &_block)
   def self.system(cmd, argv0 = nil, *args, **options)
     if verbose?
       out = (options[:out] == :err) ? $stderr : $stdout
-      out.puts "#{cmd} #{args * " "}".gsub(RUBY_PATH, "ruby")
+      out.puts "#{cmd} #{args * " "}".gsub(RUBY_PATH.to_s, "ruby")
                                      .gsub($LOAD_PATH.join(File::PATH_SEPARATOR).to_s, "$LOAD_PATH")
     end
     _system(cmd, argv0, *args, **options)

Library/Homebrew/test/rubocop_spec.rb

@@ -20,7 +20,7 @@
     end
 
     it "loads all Formula cops without errors" do
-      stdout, stderr, status = Open3.capture3(RUBY_PATH, "-W0", "-S", "rubocop", TEST_FIXTURE_DIR/"testball.rb")
+      stdout, stderr, status = Open3.capture3(RUBY_PATH.to_s, "-W0", "-S", "rubocop", TEST_FIXTURE_DIR/"testball.rb")
       expect(stderr).to be_empty
       expect(stdout).to include("no offenses detected")
       expect(status).to be_a_success

Library/Homebrew/test/sandbox_linux_spec.rb

@@ -214,7 +214,7 @@ def executable_candidate_paths = test_executable_candidate_paths
       expect(sandbox_class).not_to receive(:ensure_sandbox_installed!)
       expect(sandbox_class).to receive(:ohai).with("Configuring Bubblewrap...").ordered
       expect(sandbox_class).to receive(:system)
-        .with("sudo", HOMEBREW_BREW_FILE, "setup-sandbox").and_return(true).ordered
+        .with("sudo", HOMEBREW_BREW_FILE.to_s, "setup-sandbox").and_return(true).ordered
 
       sandbox_class.configure!
     end
@@ -237,7 +237,7 @@ def executable_candidate_paths = test_executable_candidate_paths
         .with(install_from_tests: true)
       expect(sandbox_class).to receive(:ohai).with("Configuring Bubblewrap...").ordered
       expect(sandbox_class).to receive(:system)
-        .with(HOMEBREW_BREW_FILE, "setup-sandbox").and_return(true).ordered
+        .with(HOMEBREW_BREW_FILE.to_s, "setup-sandbox").and_return(true).ordered
 
       sandbox_class.configure!
     end
@@ -247,7 +247,7 @@ def executable_candidate_paths = test_executable_candidate_paths
       allow(Process).to receive(:euid).and_return(0)
       allow(sandbox_class).to receive(:ohai)
       expect(sandbox_class).to receive(:system)
-        .with(HOMEBREW_BREW_FILE, "setup-sandbox").and_return(false)
+        .with(HOMEBREW_BREW_FILE.to_s, "setup-sandbox").and_return(false)
 
       expect { sandbox_class.configure! }.to raise_error(ErrorDuringExecution)
     end