Merge pull request #1191 from SimonPe/patch-3

(MODULES-11099) Make merge parameter data types actually backwards compatible

Author: b4ldr

lib/puppet/functions/merge.rb

@@ -40,8 +40,8 @@
   # @return
   #   The merged hash
   dispatch :merge2hashes do
-    repeated_param 'Variant[Hash, Undef, String[0,0]]', :args # this strange type is backwards compatible
-    return_type 'Hash'
+    repeated_param 'Variant[Hash[Scalar,Any], Undef, String[0,0]]', :args # this strange type is backwards compatible
+    return_type 'Hash[Scalar,Any]'
   end
 
   # @param args

spec/functions/merge_spec.rb

@@ -9,7 +9,7 @@
       .with_params({}, 'two') \
       .and_raise_error(
         ArgumentError, \
-        Regexp.new(Regexp.escape("rejected: parameter 'args' expects a value of type Undef, Hash, or String[0, 0], got String")),
+        Regexp.new(Regexp.escape("rejected: parameter 'args' expects a value of type Undef, Hash[Scalar, Any], or String[0, 0], got String")),
       )
   }
   it {