minor tidying and removal of unreachable code

DrHyde · Jan 14, 2023 · ce4e800 · ce4e800
1 parent 67274c3
commit ce4e800
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/buildtools/Number/Phone/BuildHelpers.pm b/buildtools/Number/Phone/BuildHelpers.pm
@@ -55,11 +55,8 @@ sub known_non_country_codes {
         883130 => 'InternationalNetworks883::Mobistar',
         883140 => 'InternationalNetworks883::MTTGlobalNetworks',
         888    => 'TelecomsForDisasterRelief',
-        # 979 is used for testing when we fail to load a module when we
-        # know what 'country' it is
         979    => 'InternationalPremiumRate',
         991    => 'ITPCS',
-        # 999 deliberately NYI for testing; proposed to be like 888.
     )
 }
 

diff --git a/lib/Number/Phone.pm b/lib/Number/Phone.pm
@@ -358,7 +358,6 @@ sub _make_stub_object {
         if($local_number eq '') { return undef; }
         return bless({
             country_code => $country_idd,
-            # country      => $country_name,
             is_valid     => undef,
             number       => $local_number,
         }, 'Number::Phone::StubCountry');

diff --git a/lib/Number/Phone/StubCountry.pm b/lib/Number/Phone/StubCountry.pm
@@ -20,16 +20,13 @@ sub country_code {
     my $self = shift;
 
     return $self->{country_code};
-    # return exists($self->{country_code})
-    #        ? $self->{country_code}
-    #        : Number::Phone::Country::country_code($self->country());
 }
 
 sub country {
     my $self = shift;
     if(exists($self->{country})) { return $self->{country}; }
     ref($self)=~ /::(\w+?)$/;
-    return $1;
+    return $self->{country} = $1;
 }
 
 sub raw_number {
@@ -43,9 +40,9 @@ sub is_valid {
       return $self->{is_valid};
   }
   foreach (map { "is_$_" } qw(specialrate geographic mobile pager tollfree personal ipphone)) {
-    return 1 if($self->$_());
+    return $self->{is_valid} = 1 if($self->$_());
   }
-  return 0;
+  return $self->{is_valid} = 0;
 }
 
 sub is_geographic   { shift()->_validator('geographic'); }
@@ -75,7 +72,6 @@ sub areaname {
         }
     }
     my $number = $self->raw_number();
-    return unless $self->{areanames};
     LANGUAGE: foreach my $language (@languages) {
         next LANGUAGE unless(exists($self->{areanames}->{$language}));
         my %map = %{$self->{areanames}->{$language}};
@@ -96,7 +92,7 @@ sub format {
       return join(' ', '+'.$self->country_code(), @bits);
     }
   }
-  return '+'.$self->country_code().' '.$number;
+  # return '+'.$self->country_code().' '.$number;
 }
 
 1;
diff --git a/t/coverage.sh b/t/coverage.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 cover -delete
-HARNESS_PERL_SWITCHES=-MDevel::Cover make test
-cover
+# HARNESS_PERL_SWITCHES=-MDevel::Cover make test
+AUTOMATED_TESTING=1 cover -ignore_re ^buildtools/ -test