Use constants for all error messages

Author: chadicus

src/Filter/UuidFilter.php

@@ -22,6 +22,16 @@ final class UuidFilter
      */
     const FILTER_ERROR_FORMAT = "Value '%s' is not a valid UUID. Versions checked (%s)";
 
+    /**
+     * @var string
+     */
+    const NULL_NOT_ALLOWED_ERROR = "Value is null, but null values are not allowed.";
+
+    /**
+     * @var string
+     */
+    const UNSUPPORTED_VERSION_ERROR_FORMAT = 'Filter does not support UUID v%d';
+
     /**
      * @var array
      * @internal
@@ -69,7 +79,7 @@ public static function filter(
     private static function valueIsNullAndValid(bool $allowNull, string $value = null): bool
     {
         if ($allowNull === false && $value === null) {
-            throw new FilterException('Value failed filtering, $allowNull is set to false');
+            throw new FilterException(self::NULL_NOT_ALLOWED_ERROR);
         }
 
         return $allowNull === true && $value === null;
@@ -79,7 +89,7 @@ private static function validateVersions(array $versions)
     {
         foreach ($versions as $version) {
             if (!in_array($version, self::VALID_UUID_VERSIONS)) {
-                throw new InvalidArgumentException("Filter does not support UUID v{$version}");
+                throw new InvalidArgumentException(sprintf(self::UNSUPPORTED_VERSION_ERROR_FORMAT, $version));
             }
         }
     }

tests/Filter/UuidFilterTest.php

@@ -84,7 +84,7 @@ public function filterNullAllowedNullIsFalse()
     public function filterWithInvalidVersionSpecified()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Filter does not support UUID v0');
+        $this->expectExceptionMessage(sprintf(UuidFilter::UNSUPPORTED_VERSION_ERROR_FORMAT, 0));
         UuidFilter::filter(self::UUID_V7, false, [0]);
     }