Revert "significant speedup of AC::Parameters#permit" [26dd9b26ab7317f94fd285245879e888344143b2] as it broke Parameters#to_h on at least fields_for-style nested params.

2 files changed, 1 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 6e8df02fb9..d304dcf468 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -398,8 +398,7 @@ module ActionController
 
       unpermitted_parameters!(params) if self.class.action_on_unpermitted_parameters
 
-      params.permitted = true
-      params
+      params.permit!
     end
 
     # Returns a parameter for the given +key+. If not found,
@@ -818,7 +817,6 @@ module ActionController
               # Filter this one out.
             end
           end
-          sanitized.permitted = true
         end
       end
 
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index b62a3d6d7b..82d7530e9f 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -187,11 +187,6 @@ class ParametersPermitTest < ActiveSupport::TestCase
 
     permitted = params.permit(:username, preferences: {}, hacked: {})
 
-    assert permitted.permitted?
-    assert permitted[:preferences].permitted?
-    assert permitted[:preferences][:font].permitted?
-    assert permitted[:preferences][:dubious].all?(&:permitted?)
-
     assert_equal "fxn",             permitted[:username]
     assert_equal "Marazul",         permitted[:preferences][:scheme]
     assert_equal "Source Code Pro", permitted[:preferences][:font][:name]