Make decryption return a value.

AthensFramework · Nov 24, 2015 · 78eb5f9 · 78eb5f9
1 parent 2dc3e1b
commit 78eb5f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/EncryptionBehavior.php b/src/EncryptionBehavior.php
@@ -127,7 +127,11 @@ protected function modifyGetterWithDecryption(&$script, $columnPhpName) {
     protected function decryptVariable($variableName) {
         return <<<EOT
 // Decrypt the variable, per \UWDOEM\Encryption\EncryptionBehavior.
-        $variableName = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream($variableName);
+        \$fieldValue = $variableName;
+        if (is_resource(\$fieldValue) && get_resource_type(\$fieldValue) === "stream") {
+            \$fieldValue = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream(\$fieldValue);
+        }
+        return \$fieldValue;
 EOT;
     }
 

diff --git a/tests/BehaviorTest.php b/tests/BehaviorTest.php
@@ -28,7 +28,11 @@ public function setVarBinaryColumn1($v)
     public function getVarBinaryColumn1()
     {
         // Decrypt the variable, per \UWDOEM\Encryption\EncryptionBehavior.
-        $this->test_column = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream($this->test_column);
+        $fieldValue = $this->test_column;
+        if (is_resource($fieldValue) && get_resource_type($fieldValue) === "stream") {
+            $fieldValue = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream($fieldValue);
+        }
+        return $fieldValue;
     }
 
     public function setVarBinaryColumn1($v)