ActiveRecord::Store encode store as a regular Hash

Fix: https://github.com/rails/rails/issues/45585

There's no benefit in serializing it as HWIA, it requires
to allow that type for YAML safe_load and takes more space.

We can cast it back to a regular hash before serialization.

activerecord/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Fix `ActiveRecord::Store` to serialize as a regular Hash
+
+    Previously it would serialize as an `ActiveSupport::HashWithIndifferentAccess`
+    which is wasteful and cause problem with YAML safe_load.
+
+    *Jean Boussier*
+
 *   Add `timestamptz` as a time zone aware type for PostgreSQL
 
     This is required for correctly parsing `timestamp with time zone` values in your database.

activerecord/lib/active_record/store.rb

@@ -268,7 +268,7 @@ module ActiveRecord
         end
 
         def dump(obj)
-          @coder.dump self.class.as_indifferent_hash(obj)
+          @coder.dump as_regular_hash(obj)
         end
 
         def load(yaml)
@@ -285,6 +285,18 @@ module ActiveRecord
             ActiveSupport::HashWithIndifferentAccess.new
           end
         end
+
+        private
+          def as_regular_hash(obj)
+            case obj
+            when ActiveSupport::HashWithIndifferentAccess
+              obj.to_h
+            when Hash
+              obj
+            else
+              {}
+            end
+          end
       end
   end
 end

activerecord/test/cases/store_test.rb

@@ -16,7 +16,6 @@ class StoreTest < ActiveRecord::TestCase
       parent_name: "Quinn", partner_name: "Dallas",
       partner_birthday: "1997-11-1"
     )
-    ActiveRecord.use_yaml_unsafe_load = true
   end
 
   test "reading store attributes through accessors" do
@@ -321,21 +320,3 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal [:secret_question, :two_factor_auth, :login_retry], Admin::User.stored_attributes[:configs]
   end
 end
-
-class StoreTestWithYAMLSafeLoad < StoreTest
-  fixtures :'admin/users'
-
-  setup do
-    @john = Admin::UserJSON.create!(
-      name: "Jim Doe", color: "black", remember_login: true,
-      height: "tall", is_a_good_guy: true,
-      parent_name: "Quinn", partner_name: "Dallas",
-      partner_birthday: "1997-11-1"
-    )
-    ActiveRecord.use_yaml_unsafe_load = false
-  end
-
-  def test_convert_store_attributes_from_Hash_to_HashWithIndifferentAccess_saving_the_data_and_access_attributes_indifferently
-    skip "Symbol is not a supported class in Psych::safe_load"
-  end
-end