Merge branch 'master' of github.com:UWEnrollmentManagement/Encryption

JASchilz · JASchilz · commit b0d3d79c3608 · 2015-08-31T12:41:55.000-07:00
diff --git a/src/Cipher.php b/src/Cipher.php
@@ -45,7 +45,7 @@ public function decrypt($encryptedMessage) {
 
     }
 
-    protected function decryptStream($encryptedStream) {
+    public function decryptStream($encryptedStream) {
         if (is_null($encryptedStream)) {
             return null;
         } else {
@@ -83,4 +83,4 @@ public static function getInstance() {
 
 
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function decrypt($encryptedMessage) {`
`45`	`45`
`46`	`46`	`}`
`47`	`47`
`48`		`- protected function decryptStream($encryptedStream) {`
	`48`	`+ public function decryptStream($encryptedStream) {`
`49`	`49`	`if (is_null($encryptedStream)) {`
`50`	`50`	`return null;`
`51`	`51`	`} else {`
`@@ -83,4 +83,4 @@ public static function getInstance() {`
`83`	`83`
`84`	`84`
`85`	`85`
`86`		`-}`
	`86`	`+}`