Improved phone value object validation

benatespina · benatespina · commit 20b3d11ddb57 · 2017-02-02T11:14:22.000+01:00
diff --git a/src/LIN3S/SharedKernel/Domain/Model/Identity/Id.php b/src/LIN3S/SharedKernel/Domain/Model/Identity/Id.php
@@ -43,6 +43,6 @@ public function equals(Id $id)
 
     public function __toString()
     {
-        return (string)$this->id;
+        return (string) $this->id;
     }
 }
diff --git a/src/LIN3S/SharedKernel/Domain/Model/Phone/Phone.php b/src/LIN3S/SharedKernel/Domain/Model/Phone/Phone.php
@@ -46,6 +46,9 @@ private function setPhone($phone)
         if (!$numbers) {
             throw new PhoneInvalidFormatException();
         }
+        if (!preg_match('/^[0-9]{2,3}-? ?[0-9]{6,7}/', $numbers)) {
+            throw new PhoneInvalidFormatException();
+        }
 
         return $numbers;
     }
diff --git a/tests/Double/Domain/Model/AggregateRootStub.php b/tests/Double/Domain/Model/AggregateRootStub.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Double/Domain/Model/CqrsEventStub.php b/tests/Double/Domain/Model/CqrsEventStub.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Double/Domain/Model/DomainEventStub.php b/tests/Double/Domain/Model/DomainEventStub.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Double/Domain/Model/EventSourcingEventStub.php b/tests/Double/Domain/Model/EventSourcingEventStub.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Double/Domain/Model/Identity/IdStub.php b/tests/Double/Domain/Model/Identity/IdStub.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Matchers/CollectionMatcher.php b/tests/Matchers/CollectionMatcher.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Matchers/DomainPublishedMatcher.php b/tests/Matchers/DomainPublishedMatcher.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/AggregateRootDoesNotExistExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/AggregateRootDoesNotExistExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/AggregateRootSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/AggregateRootSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementAlreadyAddedExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementAlreadyAddedExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementAlreadyRemovedExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementAlreadyRemovedExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementInvalidExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Collection/CollectionElementInvalidExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/DateTime/DateTimeSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/DateTime/DateTimeSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/DomainEventCollectionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/DomainEventCollectionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Identity/IdSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Identity/IdSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Identity/InvalidIdExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Identity/InvalidIdExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Domain/Model/Slug/SlugSpec.php b/tests/Spec/LIN3S/SharedKernel/Domain/Model/Slug/SlugSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Event/EventStreamSpec.php b/tests/Spec/LIN3S/SharedKernel/Event/EventStreamSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Exception/DomainExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Exception/DomainExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Exception/ExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Exception/ExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Exception/InvalidArgumentExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Exception/InvalidArgumentExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Exception/LogicExceptionSpec.php b/tests/Spec/LIN3S/SharedKernel/Exception/LogicExceptionSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Spec/LIN3S/SharedKernel/Infrastructure/Persistence/InMemory/EventStore/InMemoryEventStoreSpec.php b/tests/Spec/LIN3S/SharedKernel/Infrastructure/Persistence/InMemory/EventStore/InMemoryEventStoreSpec.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Shared Kernel library.
  *
- * Copyright (c) 2016 LIN3S <info@lin3s.com>
+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ public function equals(Id $id)`
`43`	`43`
`44`	`44`	`public function __toString()`
`45`	`45`	`{`
`46`		`- return (string)$this->id;`
	`46`	`+ return (string) $this->id;`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ private function setPhone($phone)`
`46`	`46`	`if (!$numbers) {`
`47`	`47`	`throw new PhoneInvalidFormatException();`
`48`	`48`	`}`
	`49`	`+ if (!preg_match('/^[0-9]{2,3}-? ?[0-9]{6,7}/', $numbers)) {`
	`50`	`+ throw new PhoneInvalidFormatException();`
	`51`	`+ }`
`49`	`52`
`50`	`53`	`return $numbers;`
`51`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/*`
`4`	`4`	`* This file is part of the Shared Kernel library.`
`5`	`5`	`*`
`6`		`- * Copyright (c) 2016 LIN3S <info@lin3s.com>`
	`6`	`+ * Copyright (c) 2016-2017 LIN3S <info@lin3s.com>`
`7`	`7`	`*`
`8`	`8`	`* For the full copyright and license information, please view the LICENSE`
`9`	`9`	`* file that was distributed with this source code.`