Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/type.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/type.rb
index 016529b..6b01408 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/type.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/type.rb
@@ -1,18 +1,28 @@
 #
 # type.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:type, :type => :rvalue, :doc => <<-EOS
-  DEPRECATED: This function will cease to function on Puppet 4; please use type3x() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.
-    EOS
-  ) do |args|
+  newfunction(:type, :type => :rvalue, :doc => <<-DOC
+    @summary
+      **DEPRECATED:** This function will cease to function on Puppet 4;
+     please use type3x() before upgrading to Puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.
+
+    @return the type when passed a value. Type can be one of:
+
+    * string
+    * array
+    * hash
+    * float
+    * integer
+    * boolean
+  DOC
+             ) do |args|
 
-    warning("type() DEPRECATED: This function will cease to function on Puppet 4; please use type3x() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.")
-    if ! Puppet::Parser::Functions.autoloader.loaded?(:type3x)
+    warning("type() DEPRECATED: This function will cease to function on Puppet 4; please use type3x() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.") # rubocop:disable Metrics/LineLength : Cannot reduce line length
+    unless Puppet::Parser::Functions.autoloader.loaded?(:type3x)
       Puppet::Parser::Functions.autoloader.load(:type3x)
     end
-    function_type3x(args + [false])
+    function_type3x(args)
   end
 end