Merge pull request #4681 from coderanger/params-coerce

Fix property coercion

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/chef/mixin/properties.rb b/lib/chef/mixin/properties.rb
index 1ee16b8b4a..ae2406f1ae 100644
--- a/lib/chef/mixin/properties.rb
+++ b/lib/chef/mixin/properties.rb
@@ -95,7 +95,7 @@ class Chef
         def property(name, type = NOT_PASSED, **options)
           name = name.to_sym
 
-          options.each { |k, v| options[k.to_sym] = v if k.is_a?(String) }
+          options = options.inject({}) { |memo, (key, value)| memo[key.to_sym] = value; memo }
 
           options[:instance_variable_name] = :"@#{name}" if !options.has_key?(:instance_variable_name)
           options[:name] = name
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 0230c8b23b..95acdeea47 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -87,7 +87,7 @@ class Chef
     #     is fully initialized.
     #
     def initialize(**options)
-      options.each { |k, v| options[k.to_sym] = v; options.delete(k) if k.is_a?(String) }
+      options = options.inject({}) { |memo, (key, value)| memo[key.to_sym] = value; memo }
       @options = options
       options[:name] = options[:name].to_sym if options[:name]
       options[:instance_variable_name] = options[:instance_variable_name].to_sym if options[:instance_variable_name]