X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fupcase.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fupcase.rb;h=563efe4b5990b85d10058b8375c78d575aa47efa;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=e847e517043675a360db04a34df831efba46caca;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/upcase.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/upcase.rb
index e847e5170..563efe4b5 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/upcase.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/upcase.rb
@@ -2,20 +2,22 @@
 #  upcase.rb
 #  Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible. To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
 #
-
 module Puppet::Parser::Functions
-  newfunction(:upcase, :type => :rvalue, :doc => <<-EOS
-Converts a string or an array of strings to uppercase.
+  newfunction(:upcase, :type => :rvalue, :doc => <<-DOC
+    Converts a string or an array of strings to uppercase.
+
+    *Examples:*
 
-*Examples:*
+        upcase("abcd")
 
-    upcase("abcd")
+    Will return:
 
-Will return:
+        ABCD
 
-    ABCD
-  EOS
-  ) do |arguments|
+    Note: from Puppet 6.0.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+  DOC
+             ) do |arguments|
 
     raise(Puppet::ParseError, "upcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size != 1
 
@@ -27,7 +29,7 @@ Will return:
 
     if value.is_a?(Array)
       # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| function_upcase([i]) }
+      result = value.map { |i| function_upcase([i]) }
     elsif value.is_a?(Hash)
       result = {}
       value.each_pair do |k, v|