Make decryption return a value.

JASchilz · JASchilz · commit 78eb5f9fa5c7 · 2015-11-24T11:23:59.000-08:00
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)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,11 @@ public function setVarBinaryColumn1($v)`
`28`	`28`	`public function getVarBinaryColumn1()`
`29`	`29`	`{`
`30`	`30`	`// Decrypt the variable, per \UWDOEM\Encryption\EncryptionBehavior.`
`31`		`- $this->test_column = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream($this->test_column);`
	`31`	`+ $fieldValue = $this->test_column;`
	`32`	`+ if (is_resource($fieldValue) && get_resource_type($fieldValue) === "stream") {`
	`33`	`+ $fieldValue = \UWDOEM\Encryption\Cipher::getInstance()->decryptStream($fieldValue);`
	`34`	`+ }`
	`35`	`+ return $fieldValue;`
`32`	`36`	`}`
`33`	`37`
`34`	`38`	`public function setVarBinaryColumn1($v)`