Merge pull request #12037 from Bo98/type-bump

Bump various type strictnesses

Library/Homebrew/api/versions.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/cask/artifact/artifact.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/uninstall.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_uninstall"

Library/Homebrew/cask/artifact/zap.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_uninstall"

Library/Homebrew/cask/cmd.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "optparse"

Library/Homebrew/cask/dsl/version.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/utils.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "utils/user"

Library/Homebrew/dev-cmd/create.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "formula"

Library/Homebrew/dev-cmd/man.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/dev-cmd/test.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "extend/ENV"

Library/Homebrew/extend/module.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 class Module

Library/Homebrew/extend/on_os.rb

@@ -1,21 +1,25 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module OnOS
+  extend T::Sig
+
   # Block only executed on macOS. No-op on Linux.
   # <pre>on_macos do
   # # Do something Mac-specific
   # end</pre>
+  sig { params(block: T.proc.void).void }
   def on_macos(&block)
-    raise "No block content defined for 'on_macos' block" unless block
+    raise "No block content defined for 'on_macos' block" unless T.unsafe(block)
   end
 
   # Block only executed on Linux. No-op on macOS.
   # <pre>on_linux do
   # # Do something Linux-specific
   # end</pre>
+  sig { params(block: T.proc.void).void }
   def on_linux(&block)
-    raise "No block content defined for 'on_linux' block" unless block
+    raise "No block content defined for 'on_linux' block" unless T.unsafe(block)
   end
 end
 

Library/Homebrew/extend/os/linux/api/analytics.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/extend/os/linux/api/bottle.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/extend/os/linux/api/formula.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/extend/os/linux/extend/ENV/std.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 module Stdenv

Library/Homebrew/extend/os/linux/extend/ENV/super.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 module Superenv

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

@@ -1,9 +1,9 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module OnOS
   def on_linux(&block)
-    raise "No block content defined for 'on_linux' block" unless block
+    raise "No block content defined for 'on_linux' block" unless T.unsafe(block)
 
     yield
   end

Library/Homebrew/extend/os/mac/language/java.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Language

Library/Homebrew/extend/os/mac/on_os.rb

@@ -1,9 +1,9 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module OnOS
   def on_macos(&block)
-    raise "No block content defined for 'on_macos' block" unless block
+    raise "No block content defined for 'on_macos' block" unless T.unsafe(block)
 
     yield
   end

Library/Homebrew/extend/os/mac/software_spec.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 # The Library/Homebrew/extend/os/software_spec.rb conditional logic will need to be more nuanced

Library/Homebrew/fetch.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/github_packages.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "utils/curl"

Library/Homebrew/github_releases.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "utils/github"

Library/Homebrew/global.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require_relative "startup"

Library/Homebrew/installed_dependents.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "cask_dependent"

Library/Homebrew/language/java.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Language
@@ -6,6 +6,9 @@ module Language
   #
   # @api public
   module Java
+    extend T::Sig
+
+    sig { params(version: T.nilable(String)).returns(T.nilable(Formula)) }
     def self.find_openjdk_formula(version = nil)
       can_be_newer = version&.end_with?("+")
       version = version.to_i
@@ -27,19 +30,23 @@ module Language
     end
     private_class_method :find_openjdk_formula
 
+    sig { params(version: T.nilable(String)).returns(T.nilable(Pathname)) }
     def self.java_home(version = nil)
       find_openjdk_formula(version)&.opt_libexec
     end
 
+    sig { params(version: T.nilable(String)).returns(String) }
     def self.java_home_shell(version = nil)
       java_home(version).to_s
     end
     private_class_method :java_home_shell
 
+    sig { params(version: T.nilable(String)).returns({ JAVA_HOME: String }) }
     def self.java_home_env(version = nil)
       { JAVA_HOME: java_home_shell(version) }
     end
 
+    sig { params(version: T.nilable(String)).returns({ JAVA_HOME: String }) }
     def self.overridable_java_home_env(version = nil)
       { JAVA_HOME: "${JAVA_HOME:-#{java_home_shell(version)}}" }
     end

Library/Homebrew/livecheck/error.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew

Library/Homebrew/migrator.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "lock_file"

Library/Homebrew/missing_formula.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "formulary"

Library/Homebrew/release_notes.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 # Helper functions for generating release notes.

Library/Homebrew/rubocops/deprecate_disable.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "rubocops/extend/formula"

Library/Homebrew/software_spec.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 # frozen_string_literal: true
 
 require "resource"

Library/Homebrew/standalone.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 # This file should be the first `require` in all entrypoints outside the `brew` environment.

Library/Homebrew/startup.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 # This file should be the first `require` in all entrypoints of `brew`.

Library/Homebrew/startup/sorbet.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 if ENV["HOMEBREW_SORBET_RUNTIME"]