Merge pull request #20768 from hyuraku/replace-sort-order-with-instance-var

replace sort_order with class instance var

Author: MikeMcQuaid

Library/Homebrew/cask/artifact/abstract_artifact.rb

@@ -54,12 +54,8 @@ def staged_path_join_executable(path)
         end
       end
 
-      def <=>(other)
-        return unless other.class < AbstractArtifact
-        return 0 if instance_of?(other.class)
-
-        # TODO: Replace class var @@sort_order with a class instance var.
-        @@sort_order ||= [ # rubocop:disable Style/ClassVars
+      def sort_order
+        @sort_order ||= [
           PreflightBlock,
           # The `uninstall` stanza should be run first, as it may
           # depend on other artifacts still being installed.
@@ -94,8 +90,13 @@ def <=>(other)
           PostflightBlock,
           Zap,
         ].each_with_index.flat_map { |classes, i| Array(classes).map { |c| [c, i] } }.to_h
+      end
+
+      def <=>(other)
+        return unless other.class < AbstractArtifact
+        return 0 if instance_of?(other.class)
 
-        (@@sort_order[self.class] <=> @@sort_order[other.class]).to_i
+        (sort_order[self.class] <=> sort_order[other.class]).to_i
       end
 
       # TODO: this sort of logic would make more sense in dsl.rb, or a
@@ -148,6 +149,7 @@ def initialize(cask, *dsl_args)
         @dsl_key = nil
         @english_article = nil
         @english_name = nil
+        @sort_order = nil
       end
 
       def config