Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / sort.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/sort.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/sort.rb
index cefbe54..a6e0509 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/sort.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/sort.rb
@@ -1,26 +1,30 @@
 #
-# sort.rb
+#  sort.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(:sort, :type => :rvalue, :doc => <<-EOS
-Sorts strings and arrays lexically.
-    EOS
-  ) do |arguments|
+  newfunction(:sort, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Sorts strings and arrays lexically.
+
+    @return
+      sorted string or array
 
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "sort(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
+    Note that from Puppet 6.0.0 the same function in Puppet will be used instead of this.
+  DOC
+             ) do |arguments|
+
+    if arguments.size != 1
+      raise(Puppet::ParseError, "sort(): Wrong number of arguments given #{arguments.size} for 1")
     end
 
     value = arguments[0]
 
-    if value.is_a?(Array) then
+    if value.is_a?(Array)
       value.sort
-    elsif value.is_a?(String) then
-      value.split("").sort.join("")
+    elsif value.is_a?(String)
+      value.split('').sort.join('')
     end
-
   end
 end