aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-02-14 21:21:30 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-02-14 21:21:47 -0500
commit79b8b626216b4f8f24b5606f3edd43d5b14cd2a6 (patch)
tree06c9451efd691b76d616d8fe3e713a7ba5b96b09 /railties/lib
parentc43c83984792ac546e7610c898cf9099cc1a2ee6 (diff)
parent4f7231da7017a198e5cff4735ffee6c7e5bb36a6 (diff)
downloadrails-79b8b626216b4f8f24b5606f3edd43d5b14cd2a6.tar.gz
rails-79b8b626216b4f8f24b5606f3edd43d5b14cd2a6.tar.bz2
rails-79b8b626216b4f8f24b5606f3edd43d5b14cd2a6.zip
Merge pull request #35249 from Edouard-chin/ec-config-for-hash-in-arrau
Fix the `config_for` to always return a NonSymbolAccessDeprecatedHash:
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb22
1 files changed, 18 insertions, 4 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d0417f8a49..fbad3e5db3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -602,10 +602,7 @@ module Rails
end
def []=(key, value)
- if value.is_a?(Hash)
- value = self.class.new(value)
- end
- super(key.to_sym, value)
+ regular_writer(key.to_sym, convert_value(value, for: :assignment))
end
private
@@ -623,6 +620,23 @@ module Rails
key
end
+
+ def convert_value(value, options = {}) # :doc:
+ if value.is_a? Hash
+ if options[:for] == :to_hash
+ value.to_hash
+ else
+ self.class.new(value)
+ end
+ elsif value.is_a?(Array)
+ if options[:for] != :assignment || value.frozen?
+ value = value.dup
+ end
+ value.map! { |e| convert_value(e, options) }
+ else
+ value
+ end
+ end
end
end
end