Merge pull request #23065 from hyuraku/formulary-factory-cache-type

Type formulary_factory cache values as Formula

Author: MikeMcQuaid

Library/Homebrew/formulary.rb

@@ -55,8 +55,7 @@ def self.platform_cache_tag
   sig {
     returns({
       api:               T.nilable(T::Hash[String, T.class_of(Formula)]),
-      # TODO: the hash values should be Formula instances, but the linux tests were failing
-      formulary_factory: T.nilable(T::Hash[String, T.untyped]),
+      formulary_factory: T.nilable(T::Hash[String, Formula]),
       path:              T.nilable(T::Hash[String, T.class_of(Formula)]),
     })
   }

Library/Homebrew/test/cmd/bundle/exec_subcommand_spec.rb

@@ -183,9 +183,11 @@
       let(:brewfile_contents) { "brew 'nginx'\nbrew 'redis'" }
 
       let(:nginx_formula) do
-        instance_double(
-          Formula,
-          name:                     "nginx",
+        nginx = formula("nginx") do
+          T.bind(self, T.class_of(Formula))
+          url "nginx-1.0"
+        end
+        allow(nginx).to receive_messages(
           any_version_installed?:   true,
           any_installed_prefix:     HOMEBREW_PREFIX/"opt/nginx",
           plist_name:               "homebrew.mxcl.nginx",
@@ -194,12 +196,15 @@
           conflicts:                [instance_double(Formula::FormulaConflict, name: "httpd")],
           keg_only?:                false,
         )
+        nginx
       end
 
       let(:redis_formula) do
-        instance_double(
-          Formula,
-          name:                     "redis",
+        redis = formula("redis") do
+          T.bind(self, T.class_of(Formula))
+          url "redis-1.0"
+        end
+        allow(redis).to receive_messages(
           any_version_installed?:   true,
           any_installed_prefix:     HOMEBREW_PREFIX/"opt/redis",
           plist_name:               "homebrew.mxcl.redis",
@@ -208,6 +213,7 @@
           conflicts:                [],
           keg_only?:                false,
         )
+        redis
       end
 
       let(:services_info_pre) do