X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fmax.rb;h=00a183aba355323d1b144bbf4b300e48851671a9;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=758c42cd6437ae3eded711a5a8ec54f221e73c74;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/max.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/max.rb
index 758c42cd6..00a183aba 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/max.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/max.rb
@@ -1,16 +1,27 @@
+#
+# max.rb
+#
 module Puppet::Parser::Functions
-  newfunction(:max, :type => :rvalue, :doc => <<-EOS
-    Returns the highest value of all arguments.
+  newfunction(:max, :type => :rvalue, :doc => <<-DOC
+    @summary
+      **Deprecated:** Returns the highest value of all arguments.
+
     Requires at least one argument.
-    EOS
-  ) do |args|
 
-    raise(Puppet::ParseError, "max(): Wrong number of arguments need at least one") if args.size == 0
+    @return
+      The highest value among those passed in
+
+    > **Note:** **Deprecated** from Puppet 6.0.0, this function has been replaced with a
+    built-in [`lstrip`](https://puppet.com/docs/puppet/latest/function.html#lstrip) function.
+    DOC
+             ) do |args|
+
+    raise(Puppet::ParseError, 'max(): Wrong number of arguments need at least one') if args.empty?
 
     # Sometimes we get numbers as numerics and sometimes as strings.
     # We try to compare them as numbers when possible
-    return args.max do |a,b|
-      if a.to_s =~ /\A-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then
+    return args.max do |a, b|
+      if a.to_s =~ %r{\A-?\d+(.\d+)?\z} && b.to_s =~ %r{\A-?\d+(.\d+)?\z}
         a.to_f <=> b.to_f
       else
         a.to_s <=> b.to_s