Encoder validation simplified.

jocic · Jan 17, 2019 · eb051a3 · eb051a3
1 parent 0ea60a5
commit eb051a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 63 deletions.
diff --git a/source/Jocic/Encoders/Base/Base16.php b/source/Jocic/Encoders/Base/Base16.php
@@ -245,28 +245,9 @@ public function isEncodingValid($encoding)
                 return true;
             }
 
-            // Step 2 - Check General Form
+            // Step 2 - Check Encoding
 
-            if (!preg_match("/^([A-z0-9]+)?$/", $encoding))
-            {
-                return false;
-            }
-
-            // Step 3 - Generate Character Array
-
-            $characters = str_split($encoding);
-
-            // Step 4 - Check Characters
-
-            foreach ($characters as $character)
-            {
-                if (!in_array($character, $baseTable))
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return preg_match("/^([A-F0-7]+)([=]+)?$/", $encoding) == 1;
         }
 
         /********************\

diff --git a/source/Jocic/Encoders/Base/Base32.php b/source/Jocic/Encoders/Base/Base32.php
@@ -265,28 +265,9 @@ public function isEncodingValid($encoding)
                 return true;
             }
 
-            // Step 2 - Check General Form
+            // Step 2 - Check Encoding
 
-            if (!preg_match("/^([A-z0-9]+)([=]+)?$/", $encoding))
-            {
-                return false;
-            }
-
-            // Step 3 - Trim Padding & Generate Array
-
-            $characters = str_split(rtrim($encoding, $basePadding));
-
-            // Step 4 - Check Characters
-
-            foreach ($characters as $character)
-            {
-                if (!in_array($character, $baseTable))
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return preg_match("/^([A-Z2-7]+)([=]+)?$/", $encoding) == 1;
         }
 
         /********************\

diff --git a/source/Jocic/Encoders/Base/Base64.php b/source/Jocic/Encoders/Base/Base64.php
@@ -269,28 +269,9 @@ public function isEncodingValid($encoding)
                 return true;
             }
 
-            // Step 2 - Check General Form
+            // Step 2 - Check Encoding
 
-            if (!preg_match("/^([A-z0-9]+)([=]+)?$/", $encoding))
-            {
-                return false;
-            }
-
-            // Step 3 - Trim Padding & Generate Array
-
-            $characters = str_split(rtrim($encoding, $basePadding));
-
-            // Step 4 - Check Characters
-
-            foreach ($characters as $character)
-            {
-                if (!in_array($character, $baseTable))
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return preg_match("/^([A-z0-9+\/]+)([=]+)?$/", $encoding) == 1;
         }
 
         /********************\