Merge pull request #15 from fkooman/add-encodeUnpadded

implement Base64::encodeUnpadded for v1.x

Author: paragonie-scott

src/Base64.php

@@ -41,6 +41,29 @@ abstract class Base64 implements EncoderInterface
      * @return string
      */
     public static function encode($src)
+    {
+        return static::doEncode($src, \true);
+    }
+
+    /**
+     * Encode into Base64, no = padding
+     *
+     * Base64 character set "[A-Z][a-z][0-9]+/"
+     *
+     * @param string $src
+     * @return string
+     */
+    public static function encodeUnpadded($src)
+    {
+        return static::doEncode($src, \false);
+    }
+
+    /**
+     * @param string $src
+     * @param bool $pad   Include = padding?
+     * @return string
+     */
+    protected static function doEncode($src, $pad = \true)
     {
         $dest = '';
         $srcLen = Binary::safeStrlen($src);
@@ -66,11 +89,17 @@ public static function encode($src)
                 $dest .=
                     static::encode6Bits(               $b0 >> 2       ) .
                     static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    static::encode6Bits( ($b1 << 2)               & 63) . '=';
+                    static::encode6Bits( ($b1 << 2)               & 63);
+                if ($pad) {
+                    $dest .= '=';
+                }
             } else {
                 $dest .=
                     static::encode6Bits( $b0 >> 2) .
-                    static::encode6Bits(($b0 << 4) & 63) . '==';
+                    static::encode6Bits(($b0 << 4) & 63);
+                if ($pad) {
+                    $dest .= '==';
+                }
             }
         }
         return $dest;

tests/Base64UrlSafeTest.php

@@ -22,7 +22,15 @@ public function testRandom()
                     \strtr(\base64_encode($random), '+/', '-_'),
                     $enc
                 );
-
+                $unpadded = \rtrim($enc, '=');
+                $this->assertSame(
+                    $unpadded,
+                    Base64UrlSafe::encodeUnpadded($random)
+                );
+                $this->assertSame(
+                    $random,
+                    Base64UrlSafe::decode($unpadded)
+                );
             }
         }
     }