Add the remaining ones

Author: dduugg

Library/Homebrew/dev-cmd/bottle.rb

@@ -182,8 +182,8 @@ def merge_json_files(json_files)
 
       sig {
         params(old_keys: T::Array[Symbol], old_bottle_spec: BottleSpecification,
-               new_bottle_hash: T::Hash[String, T.untyped]).returns([T::Array[String],
-                                                                     T::Array[T::Hash[Symbol, String]]])
+               new_bottle_hash: T::Hash[String, T.untyped])
+          .returns([T::Array[String], T::Array[T::Hash[Symbol, T.any(String, Symbol)]]])
       }
       def merge_bottle_spec(old_keys, old_bottle_spec, new_bottle_hash)
         mismatches = []
@@ -862,7 +862,8 @@ def merge
 
       sig {
         params(formula: Formula, formula_ast: Utils::AST::FormulaAST,
-               bottle_hash: T::Hash[String, T.untyped]).returns(T.nilable(T::Array[T::Hash[Symbol, String]]))
+               bottle_hash: T::Hash[String, T.untyped])
+          .returns(T.nilable(T::Array[T::Hash[Symbol, T.any(String, Symbol)]]))
       }
       def old_checksums(formula, formula_ast, bottle_hash)
         bottle_node = T.cast(formula_ast.bottle_block, T.nilable(RuboCop::AST::BlockNode))

Library/Homebrew/extend/os/linux/cask/config.rb

@@ -15,7 +15,7 @@ module ClassMethods
             appdir:         "~/.config/apps",
           }.freeze, T::Hash[Symbol, String])
 
-          sig { returns(T::Hash[Symbol, String]) }
+          sig { returns(T::Hash[Symbol, T.any(LazyObject, String)]) }
           def defaults
             {
               languages: LazyObject.new { Linux.languages },

Library/Homebrew/formula_installer.rb

@@ -1593,7 +1593,7 @@ def pour
 
     keg = Keg.new(formula.prefix)
     skip_linkage = formula.bottle_specification.skip_relocation?
-    keg.replace_placeholders_with_locations(tab.changed_files, skip_linkage:)
+    keg.replace_placeholders_with_locations(tab.changed_files&.map { Pathname(_1) }, skip_linkage:)
 
     cellar = formula.bottle_specification.tag_to_cellar(Utils::Bottles.tag)
     return if [:any, :any_skip_relocation].include?(cellar)

Library/Homebrew/standalone/sorbet.rb

@@ -50,18 +50,72 @@ def sig(arg0 = nil, &blk); end
 
 module T
   module Types
+    class FixedArray < Base
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class FixedHash < Base
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class Intersection < Base
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
     class TypedArray < TypedEnumerable
       # overrides Base
       def valid?(obj)
         recursively_valid?(obj)
       end
     end
 
+    class TypedEnumerable < Base
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class TypedEnumeratorChain < TypedEnumerable
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class TypedEnumeratorLazy < TypedEnumerable
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
     class TypedHash < TypedEnumerable
       # overrides Base
       def valid?(obj)
         recursively_valid?(obj)
       end
     end
+
+    class TypedRange < TypedEnumerable
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class TypedSet < TypedEnumerable
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
+
+    class Union < Base
+      def valid?(obj)
+        recursively_valid?(obj)
+      end
+    end
   end
 end

Library/Homebrew/test/spec_helper.rb

@@ -25,24 +25,6 @@
 require_relative "../standalone"
 require_relative "../warnings"
 
-module T
-  module Types
-    class TypedArray < TypedEnumerable
-      # overrides Base
-      def valid?(obj)
-        recursively_valid?(obj)
-      end
-    end
-
-    class TypedHash < TypedEnumerable
-      # overrides Base
-      def valid?(obj)
-        recursively_valid?(obj)
-      end
-    end
-  end
-end
-
 Warnings.ignore :parser_syntax do
   require "rubocop"
 end