Merge pull request #27738 from kenta-s/remove-unused-argument-formats

Remove unused argument `formats`

2 files changed, 27 insertions, 27 deletions

diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index 924de3da06..d3905b5f23 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -226,7 +226,7 @@ module ActionView
         template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
 
         template_paths.map do |template|
-          handler, format, variant = extract_handler_and_format_and_variant(template, formats)
+          handler, format, variant = extract_handler_and_format_and_variant(template)
           contents = File.binread(template)
 
           Template.new(contents, File.expand_path(template), handler,
@@ -289,7 +289,7 @@ module ActionView
       # Extract handler, formats and variant from path. If a format cannot be found neither
       # from the path, or the handler, we should return the array of formats given
       # to the resolver.
-      def extract_handler_and_format_and_variant(path, default_formats)
+      def extract_handler_and_format_and_variant(path)
         pieces = File.basename(path).split(".".freeze)
         pieces.shift
 
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb
index f4a7a9138c..3188526b63 100644
--- a/actionview/lib/action_view/testing/resolvers.rb
+++ b/actionview/lib/action_view/testing/resolvers.rb
@@ -17,35 +17,35 @@ module ActionView #:nodoc:
       @hash.keys.join(", ")
     end
 
-  private
-
-    def query(path, exts, formats, _)
-      query = ""
-      EXTENSIONS.each_key do |ext|
-        query << "(" << exts[ext].map { |e| e && Regexp.escape(".#{e}") }.join("|") << "|)"
-      end
-      query = /^(#{Regexp.escape(path)})#{query}$/
-
-      templates = []
-      @hash.each do |_path, array|
-        source, updated_at = array
-        next unless query.match?(_path)
-        handler, format, variant = extract_handler_and_format_and_variant(_path, formats)
-        templates << Template.new(source, _path, handler,
-          virtual_path: path.virtual,
-          format: format,
-          variant: variant,
-          updated_at: updated_at
-        )
+    private
+
+      def query(path, exts, _, _)
+        query = ""
+        EXTENSIONS.each_key do |ext|
+          query << "(" << exts[ext].map { |e| e && Regexp.escape(".#{e}") }.join("|") << "|)"
+        end
+        query = /^(#{Regexp.escape(path)})#{query}$/
+
+        templates = []
+        @hash.each do |_path, array|
+          source, updated_at = array
+          next unless query.match?(_path)
+          handler, format, variant = extract_handler_and_format_and_variant(_path)
+          templates << Template.new(source, _path, handler,
+            virtual_path: path.virtual,
+            format: format,
+            variant: variant,
+            updated_at: updated_at
+          )
+        end
+
+        templates.sort_by { |t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
       end
-
-      templates.sort_by { |t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
-    end
   end
 
   class NullResolver < PathResolver
-    def query(path, exts, formats, _)
-      handler, format, variant = extract_handler_and_format_and_variant(path, formats)
+    def query(path, exts, _, _)
+      handler, format, variant = extract_handler_and_format_and_variant(path)
       [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant)]
     end
   end