Optional and Optional[Any] treated the same by Type::Params

Author: tobyink

lib/Type/Params/Parameter.pm

@@ -81,7 +81,7 @@ sub optional  {
 		: do {
 			$_[0]{optional} = $_[0]->has_default || grep(
 				$_->{uniq} == Optional->{uniq},
-				$_[0]->type->parents,
+				$_[0]->type, $_[0]->type->parents,
 			);
 		}
 }
@@ -173,6 +173,10 @@ sub _make_code {
 		&& $constraint->parent
 		&& $constraint->parent->{uniq} eq Optional->{uniq}
 		&& $constraint->type_parameter;
+	
+	# Allow Optional itself, without any parameter.
+	$really_optional = Types::Standard::Any
+		if $constraint && $constraint->{uniq} eq Optional->{uniq};
 
 	my $strictness;
 	if ( $self->has_strictness ) {

t/20-modules/Type-Params/v2-named-backcompat.t

@@ -90,4 +90,39 @@ is $o->myfunc2( arr => \@arr, int => 4 ), 'e', 'myfunc2 (happy path)';
 	like $e, qr/Wrong number of parameters/, 'myfunc2 (param count exception)'
 }
 
+
+BEGIN {
+	package Local::MyPackage2;
+	
+	use strict;
+	use warnings;
+	
+	use Types::Standard -types;
+	use Type::Params -sigs;
+	
+	signature_for test => (
+		method => !!1,
+		named  => [ foo => Optional, bar => Optional[Any] ],
+	);
+	
+	sub test {
+		my ( $self, $arg ) = @_;
+		my $sum;
+		$sum += $arg->foo if $arg->has_foo;
+		$sum += $arg->bar if $arg->has_bar;
+		return $sum;
+	}
+}
+
+subtest 'Optional and Optional[Any] treated the same' => sub {
+	my $o = bless {}, 'Local::MyPackage2';
+	my $e = exception {
+		is $o->test( foo => 2, bar => 5 ),      7;
+		is $o->test(           bar => 5 ),      5;
+		is $o->test( foo => 2           ),      2;
+		is $o->test(                    ),  undef;
+	};
+	is $e, undef, 'No exception';
+};
+
 done_testing;

t/20-modules/Type-Params/v2-named.t

@@ -110,4 +110,39 @@ my @arr = ( 'a' .. 'z' );
 	like $e, qr/Wrong number of parameters/, 'myfunc2 (param count exception)'
 }
 
+BEGIN {
+	package Local::MyPackage2;
+	
+	use strict;
+	use warnings;
+	
+	use experimental 'signatures';
+	
+	use Types::Standard -types;
+	use Type::Params -sigs;
+	
+	signature_for test => (
+		method => !!1,
+		named  => [ foo => Optional, bar => Optional[Any] ],
+	);
+	
+	sub test ( $self, $arg ) {
+		my $sum;
+		$sum += $arg->foo if $arg->has_foo;
+		$sum += $arg->bar if $arg->has_bar;
+		return $sum;
+	}
+}
+
+subtest 'Optional and Optional[Any] treated the same' => sub {
+	my $o = bless {}, 'Local::MyPackage2';
+	my $e = exception {
+		is $o->test( foo => 2, bar => 5 ),      7;
+		is $o->test(           bar => 5 ),      5;
+		is $o->test( foo => 2           ),      2;
+		is $o->test(                    ),  undef;
+	};
+	is $e, undef, 'No exception';
+};
+
 done_testing;