diff --git a/lib/WebGUI/Deprecate.pm b/lib/WebGUI/Deprecate.pm index b0208a311..e6f6898a8 100644 --- a/lib/WebGUI/Deprecate.pm +++ b/lib/WebGUI/Deprecate.pm @@ -71,15 +71,15 @@ sub deprecate ($$) { my %deep; # keep a copy since it will be replaced - my $new_sub = $stash->get_package_symbol('&'.$new_method); + my $new_sub = $stash->get_symbol('&'.$new_method); # call new method instead. if - $stash->add_package_symbol('&'.$old_method, sub { + $stash->add_symbol('&'.$old_method, sub { my $self = shift; derp "$package\::$old_method is deprecated and should be replaced with $new_method"; local $deep{1} = 1; $self->$new_method(@_); }); - $stash->add_package_symbol('&'.$new_method, sub { + $stash->add_symbol('&'.$new_method, sub { my $self = $_[0]; if (!$deep{1}) { my $old_sub = $self->can($old_method); diff --git a/lib/WebGUI/Test/MockAsset.pm b/lib/WebGUI/Test/MockAsset.pm index f22f1b224..da8abac20 100644 --- a/lib/WebGUI/Test/MockAsset.pm +++ b/lib/WebGUI/Test/MockAsset.pm @@ -120,7 +120,7 @@ sub new { }; my $stash = Package::Stash->new(ref $mock); - $stash->add_package_symbol('&DESTROY', sub { + $stash->add_symbol('&DESTROY', sub { my $self = shift; $self->unmock_id; $self->unmock_url; @@ -134,7 +134,7 @@ sub new { # remove our namespace delete $ns_root->{ $ns_last }; }); - $stash->add_package_symbol('&mock_id', sub { + $stash->add_symbol('&mock_id', sub { my $self = shift; $self->unmock_id; $mocked_id = shift; @@ -145,14 +145,14 @@ sub new { return $self; }); - $stash->add_package_symbol('&unmock_id', sub { + $stash->add_symbol('&unmock_id', sub { my $self = shift; if ($mocked_id) { $CLASS->unmock_id($mocked_id); } return $self; }); - $stash->add_package_symbol('&mock_url', sub { + $stash->add_symbol('&mock_url', sub { my $self = shift; $self->unmock_url; $mocked_url = shift; @@ -162,7 +162,7 @@ sub new { return $self; }); - $stash->add_package_symbol('&unmock_url', sub { + $stash->add_symbol('&unmock_url', sub { my $self = shift; if ($mocked_url) { $CLASS->unmock_url($mocked_url); diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl index 3c97f08ac..42b4b66c4 100755 --- a/sbin/testEnvironment.pl +++ b/sbin/testEnvironment.pl @@ -166,7 +166,7 @@ checkModule("Cache::FastMmap", "1.35" ); checkModule("Test::Log::Dispatch", "0" ); checkModule("CHI", "0.34" ); checkModule('IO::Socket::SSL', ); -checkModule('Package::Stash', "0.33" ); +checkModule('Package::Stash', "0.36" ); checkModule('HTTP::Exception', ); checkModule('Net::Twitter', "3.13006" ); checkModule('PerlIO::eol', "0.14" );