Merge pull request #50058 from Shopify/fix-implicit-strict-locals-again

ActionView::Template fix computation of strict locals

actionview/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Fix detection of required strict locals
+
+    Further fix `render @collection` compatibility with strict locals
+
+    *Jean Boussier*
+
 ## Rails 7.1.2 (November 10, 2023) ##
 
 *   Fix the `number_to_human_size` view helper to correctly work with negative numbers.

actionview/lib/action_view/template.rb

@@ -501,7 +501,7 @@ def compile(mod)
         end
 
         unless parameters.any? { |type, _| type == :keyrest }
-          parameters.map!(&:first)
+          parameters.map!(&:last)
           parameters.sort!
           @strict_local_keys = parameters.freeze
         end

actionview/test/template/template_test.rb

@@ -215,6 +215,11 @@ def test_rails_injected_locals_can_be_specified_as_kwargs
     assert_equal "1-2", render(message: "Hello", message_counter: 1, message_iteration: 2, implicit_locals: %i[message_counter message_iteration])
   end
 
+  def test_rails_injected_locals_can_be_specified_as_required_argument
+    @template = new_template("<%# locals: (message: 'Hello', message_iteration:) -%>\n<%= message %>-<%= message_iteration %>")
+    assert_equal "Hello-2", render(message: "Hello", message_counter: 1, message_iteration: 2, implicit_locals: %i[message_counter message_iteration])
+  end
+
   # TODO: This is currently handled inside ERB. The case of explicitly
   # lying about encodings via the normal Rails API should be handled
   # inside Rails.