Merge pull request #672 from DavidS/modules-3961-fix-deprecation-warnings

(MODULES-3961) emit more deprecation warnings

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/puppet/parser/functions/validate_string.rb b/lib/puppet/parser/functions/validate_string.rb
index 0057fc1..6675d86 100644
--- a/lib/puppet/parser/functions/validate_string.rb
+++ b/lib/puppet/parser/functions/validate_string.rb
@@ -13,23 +13,24 @@ module Puppet::Parser::Functions
 
         validate_string(true)
         validate_string([ 'some', 'array' ])
-        
+
     Note: validate_string(undef) will not fail in this version of the
     functions API (incl. current and future parser). Instead, use:
-    
+
         if $var == undef {
           fail('...')
         }
-    
+
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_string, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_string(): wrong number of arguments (#{args.length}; must be > 0)")
     end
 
     args.each do |arg|
+      # when called through the v4 API shim, undef gets translated to nil
       unless arg.is_a?(String) || arg.nil?
         raise Puppet::ParseError, ("#{arg.inspect} is not a string.  It looks to be a #{arg.class}")
       end