Return form number in list context. Fixes #71

lib/WWW/Mechanize.pm

@@ -1350,6 +1350,8 @@ selected.
 
 If it is found, the form is returned as an L<HTML::Form> object and set internally
 for later use with Mech's form methods such as C<L</field()>> and C<L</click()>>.
+When called in a list context, the number of the found form is also returned as
+a second value.
 
 Emits a warning and returns undef if no form is found.
 
@@ -1364,10 +1366,12 @@ sub form_number {
     my $forms = $self->forms;
     if ( $forms->[$form-1] ) {
         $self->{current_form} = $forms->[$form-1];
-        return $self->{current_form};
+        return wantarray
+          ? ($self->{current_form}, $form)
+          : $self->{current_form};
     }
 
-    return;
+    return wantarray ? () : undef;
 }
 
 =head2 $mech->form_name( $name )

t/local/form.t

@@ -1,6 +1,6 @@
 use warnings;
 use strict;
-use Test::More tests => 19;
+use Test::More tests => 21;
 
 use lib 't/local';
 use LocalServer;
@@ -21,6 +21,10 @@ $mech->get($server->url);
 ok( $mech->success, 'Got a page' ) or die;
 is( $mech->uri, $server->url, 'Got page' );
 
+my ($form, $number) = $mech->form_number(1);
+isa_ok( $form, 'HTML::Form', 'Can select the first form in list context call');
+is( $number, 1, 'Form number is correct' );
+
 my $form_number_1 = $mech->form_number(1);
 isa_ok( $form_number_1, 'HTML::Form', 'Can select the first form');
 is( $mech->current_form(), $mech->{forms}->[0], 'Set the form attribute' );