Merge pull request #14 from personnummer/feature/return-values-21

Change return values on getAge and format
personnummer · Sep 27, 2019 · f09e4c5 · f09e4c5
2 parents 3363798 + 6699062
commit f09e4c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/Personnummer.php b/src/Personnummer.php
@@ -64,7 +64,7 @@ public static function valid($ssn, $includeCoordinationNumber = true)
     public static function format($ssn, $longFormat = false)
     {
         if (!self::valid($ssn)) {
-            throw new PersonnummerException();
+            return false;
         }
 
         $parts = self::getParts($ssn);
@@ -101,7 +101,7 @@ public static function format($ssn, $longFormat = false)
     public static function getAge($ssn, $includeCoordinationNumber = true)
     {
         if (!self::valid($ssn, $includeCoordinationNumber)) {
-            throw new PersonnummerException();
+            return 0;
         }
 
         $parts = self::getParts($ssn);
@@ -117,7 +117,7 @@ public static function getAge($ssn, $includeCoordinationNumber = true)
         try {
             $d2 = new DateTime(sprintf('%s%s-%s-%d', $parts['century'], $parts['year'], $parts['month'], $day));
         } catch (Exception $e) {
-            throw new PersonnummerException();
+            return 0;
         }
 
         return $d1->diff($d2)->y;

diff --git a/tests/PersonnummerTest.php b/tests/PersonnummerTest.php
@@ -105,9 +105,7 @@ public function testFormat()
     public function testFormatWithInvalidNumbers()
     {
         foreach ($this->invalidNumbers as $invalidNumber) {
-            $this->assertException(function () use ($invalidNumber) {
-                Personnummer::format($invalidNumber);
-            }, PersonnummerException::class);
+            $this->assertFalse(Personnummer::format($invalidNumber));
         }
     }
 
@@ -129,20 +127,14 @@ public function testAgeWithCoOrdinationNumbers()
     public function testAgeWithInvalidNumbers()
     {
         foreach ($this->invalidNumbers as $invalidNumber) {
-            $this->assertException(function () use ($invalidNumber) {
-                Personnummer::getAge($invalidNumber);
-            }, PersonnummerException::class);
+            $this->assertEmpty(Personnummer::getAge($invalidNumber));
         }
     }
 
     public function testExcludeOfCoOrdinationNumbersAge()
     {
-        $this->assertException(function () {
-            Personnummer::getAge('701063-2391', false);
-        }, PersonnummerException::class);
-        $this->assertException(function () {
-            Personnummer::getAge('640883-3231', false);
-        }, PersonnummerException::class);
+        $this->assertEmpty(Personnummer::getAge('701063-2391', false));
+        $this->assertEmpty(Personnummer::getAge('640883-3231', false));
     }
 
     public function testSex()