Merge branch 'master' into formula_php_shebang

Library/Homebrew/Gemfile.lock

@@ -121,15 +121,15 @@ GEM
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
-    sorbet (0.5.11993)
+    sorbet (0.5.11998)
-      sorbet-static (= 0.5.11993)
+      sorbet-static (= 0.5.11998)
-    sorbet-runtime (0.5.11993)
+    sorbet-runtime (0.5.11998)
-    sorbet-static (0.5.11993-aarch64-linux)
+    sorbet-static (0.5.11998-aarch64-linux)
-    sorbet-static (0.5.11993-universal-darwin)
+    sorbet-static (0.5.11998-universal-darwin)
-    sorbet-static (0.5.11993-x86_64-linux)
+    sorbet-static (0.5.11998-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11993)
+    sorbet-static-and-runtime (0.5.11998)
-      sorbet (= 0.5.11993)
+      sorbet (= 0.5.11998)
-      sorbet-runtime (= 0.5.11993)
+      sorbet-runtime (= 0.5.11998)
     spoom (1.6.1)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)

Library/Homebrew/dev-cmd/vendor-gems.rb

@@ -28,6 +28,7 @@ module Homebrew
         Homebrew.install_bundler!
 
         ENV["BUNDLE_WITH"] = Homebrew.valid_gem_groups.join(":")
+        ENV["BUNDLER_VERSION"] = HOMEBREW_BUNDLER_VERSION
 
         ohai "cd #{HOMEBREW_LIBRARY_PATH}"
         HOMEBREW_LIBRARY_PATH.cd do

Library/Homebrew/test/cmd/upgrade_spec.rb

@@ -54,19 +54,11 @@ RSpec.describe Homebrew::Cmd::UpgradeCmd do
 
     regex = /
       Formulae\s*\(3\):\s*
-      (
+      (testball|testball5|testball4)
-        testball|testball5|testball4
-      )
       \s*,\s*
-      (?!\1)
+      ((?!\1)testball|testball5|testball4)
-      (
-        testball|testball5|testball4
-      )
       \s*,\s*
-      (?!\1|\2)
+      ((?!\1|\2)testball|testball5|testball4)
-      (
-        testball|testball5|testball4
-      )
     /x
     expect do
       brew "upgrade", "--ask"

Library/Homebrew/vendor/bundle/bundler/setup.rb

@@ -77,7 +77,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rainbow-3.1.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/rbs-3.9.2")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rbs-3.9.2/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11993/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11998/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rbi-0.3.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/redcarpet-3.6.1")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/redcarpet-3.6.1/lib")
@@ -107,9 +107,9 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov_json_formatter-0.1.4/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-0.22.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-cobertura-2.1.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11993-universal-darwin/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.5.11998-universal-darwin/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11993/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.5.11998/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11993/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.5.11998/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/thor-1.3.2/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.6.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/stackprof-0.2.27")