Merge branch 'hotfix/5902' into develop

Close zendframework/zendframework#5902
Fixes zendframework/zendframework#5680

src/BlockCipher.php

@@ -391,9 +391,19 @@ public function getPbkdf2HashAlgorithm()
     public function encrypt($data)
     {
         // 0 (as integer), 0.0 (as float) & '0' (as string) will return false, though these should be allowed
-        if (!is_string($data) || $data === '') {
+        // Must be a string, integer, or float in order to encrypt
+        if ((is_string($data) && $data === '')
+            || is_array($data)
+            || is_object($data)
+        ) {
             throw new Exception\InvalidArgumentException('The data to encrypt cannot be empty');
         }
+
+        // Cast to string prior to encrypting
+        if (!is_string($data)) {
+            $data = (string) $data;
+        }
+
         if (empty($this->cipher)) {
             throw new Exception\InvalidArgumentException('No symmetric cipher specified');
         }

src/Symmetric/Mcrypt.php

@@ -326,7 +326,8 @@ public function getPadding()
      */
     public function encrypt($data)
     {
-        if (empty($data)) {
+        // Cannot encrypt empty string
+        if (!is_string($data) || $data === '') {
             throw new Exception\InvalidArgumentException('The data to encrypt cannot be empty');
         }
         if (null === $this->getKey()) {

test/BlockCipherTest.php

@@ -156,6 +156,32 @@ public function testEncryptDecryptUsingBinary()
         }
     }
 
+    public function zeroValuesProvider()
+    {
+        return array(
+            '"0"'   => array(0),
+            '"0.0"' => array(0.0),
+            '"0"'   => array('0'),
+        );
+    }
+
+    /**
+     * @dataProvider zeroValuesProvider
+     */
+    public function testEncryptDecryptUsingZero($value)
+    {
+        $this->blockCipher->setKey('test');
+        $this->blockCipher->setKeyIteration(1000);
+        foreach ($this->blockCipher->getCipherSupportedAlgorithms() as $algo) {
+            $this->blockCipher->setCipherAlgorithm($algo);
+
+            $encrypted = $this->blockCipher->encrypt($value);
+            $this->assertTrue(!empty($encrypted));
+            $decrypted = $this->blockCipher->decrypt($encrypted);
+            $this->assertEquals($value, $decrypted);
+        }
+    }
+
     public function testDecryptAuthFail()
     {
         $this->blockCipher->setKey('test');