Merge branch 'master' into treewip

* master: (27 commits)
  move digest cache on to the DetailsKey object
  remove object `hash` cache
  [ci skip] fix suggested change-replace 'an' with 'the in Rails engine guide'
  Missing documentation about hash algorithm option for MessageVerifier [ci skip]
  set `skip_listen` option to dummy appplication
  Fix the language in engines guide
  Add accidentally removed `#` [ci skip]
  fields_for_style needs to test for AC::Parameters
  Fix indentation for code block in changelog
  Remove accidentally duplicated change log title [ci skip]
  partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2
  Remove needless `case_insensitive_comparison` in mysql2 adapter
  modify to `error` also abort when specify fail fast option
  Implement ActionController::Parameters#inspect
  remove unused method
  Remove unused Journey code
  Add Action Cable CHANGELOG in release notes [ci skip]
  Show proper error message when a non-relation object is passed to AR::Relation#or
  Fix semantics of test names for finish option in batches_test
  Fix typo
  ...

Conflicts:
	actionview/lib/action_view/digestor.rb

3 files changed, 32 insertions, 9 deletions

diff --git a/actionpack/test/controller/parameters/accessors_test.rb b/actionpack/test/controller/parameters/accessors_test.rb
index bd43ff7697..08b3d81bf0 100644
--- a/actionpack/test/controller/parameters/accessors_test.rb
+++ b/actionpack/test/controller/parameters/accessors_test.rb
@@ -134,4 +134,13 @@ class ParametersAccessorsTest < ActiveSupport::TestCase
     params1 = ActionController::Parameters.new(hash1)
     assert(params1 == hash1)
   end
+
+  test "inspect shows both class name and parameters" do
+    assert_equal(
+      '<ActionController::Parameters {"person"=>{"age"=>"32", '\
+      '"name"=>{"first"=>"David", "last"=>"Heinemeier Hansson"}, ' \
+      '"addresses"=>[{"city"=>"Chicago", "state"=>"Illinois"}]}}>',
+      @params.inspect
+    )
+  end
 end
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 3299f2d9d0..96048e2868 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -27,6 +27,27 @@ class ParametersPermitTest < ActiveSupport::TestCase
     end
   end
 
+  def walk_permitted params
+    params.each do |k,v|
+      case v
+      when ActionController::Parameters
+        walk_permitted v
+      when Array
+        v.each { |x| walk_permitted v }
+      end
+    end
+  end
+
+  test 'iteration should not impact permit' do
+    hash = {"foo"=>{"bar"=>{"0"=>{"baz"=>"hello", "zot"=>"1"}}}}
+    params = ActionController::Parameters.new(hash)
+
+    walk_permitted params
+
+    sanitized = params[:foo].permit(bar: [:baz])
+    assert_equal({"0"=>{"baz"=>"hello"}}, sanitized[:bar].to_unsafe_h)
+  end
+
   test 'if nothing is permitted, the hash becomes empty' do
     params = ActionController::Parameters.new(id: '1234')
     permitted = params.permit
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index a3992ad008..64801bff39 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -37,9 +37,9 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     )
   end
 
-  test "parses json params for application/vnd.api+json" do
+  test "does not parse unregistered media types such as application/vnd.api+json" do
     assert_parses(
-      {"person" => {"name" => "David"}},
+      {},
       "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
     )
   end
@@ -143,13 +143,6 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
     )
   end
 
-  test "parses json params for application/vnd.api+json" do
-    assert_parses(
-      {"user" => {"username" => "sikachu"}, "username" => "sikachu"},
-      "{\"username\": \"sikachu\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
-    )
-  end
-
   test "parses json with non-object JSON content" do
     assert_parses(
       {"user" => {"_json" => "string content" }, "_json" => "string content" },