Support for encrypting multiple columns.

Author: JASchilz

src/EncryptionBehavior.php

@@ -19,11 +19,8 @@ public function allowMultiple() {
     );
 
     public function tableMapFilter(&$script) {
-        $table = $this->getTable();
 
-        foreach ($this->getEncryptedColumnNames() as $columnName) {
-            $column = $table->getColumn($columnName);
-            $columnPhpName = $column->getPhpName();
+        foreach ($this->getEncryptedColumnPhpNames() as $columnPhpName) {
 
             $encryptedColumnsDeclarationLocation = strpos($script, "ENCRYPTED_COLUMNS");
 
@@ -45,26 +42,24 @@ public function tableMapFilter(&$script) {
     }
 
     public function objectFilter(&$script) {
-        $table = $this->getTable();
-
-        foreach ($this->getEncryptedColumnNames() as $columnName) {
-            $aggregateColumn = $table->getColumn($columnName);
-            $columnPhpName = $aggregateColumn->getPhpName();
 
+        foreach ($this->getEncryptedColumnPhpNames() as $columnPhpName) {
             $this->modifySetterWithEncryption($script, $columnPhpName);
             $this->modifyGetterWithDecryption($script, $columnPhpName);
-
         }
     }
 
-    protected function getEncryptedColumnNames() {
-        $encryptedColumnNames = [];
-        foreach ($this->getParameters() as $key => $parameter) {
-            if (strpos($key, "column_name") !== false) {
-                $encryptedColumnNames[] = $parameter;
+    protected function getEncryptedColumnPhpNames() {
+        $table = $this->getTable();
+
+        $encryptedColumnPhpNames = [];
+        foreach ($this->getParameters() as $key => $columnName) {
+            if (strpos($key, "column_name") !== false && $columnName) {
+                $column = $table->getColumn($columnName);
+                $encryptedColumnPhpNames[] = $column->getPhpName();
             }
         }
-        return $encryptedColumnNames;
+        return $encryptedColumnPhpNames;
     }
 
     protected function makeEncryptedColumnsDeclaration($columnPhpName) {

tests/BehaviorTest.php

@@ -149,14 +149,24 @@ public function getTable() {
 
 class BehaviorTest extends PHPUnit_Framework_TestCase {
 
+    protected function normalizeWhitespace($string) {
+        $string = trim($string);
+        $string = str_replace("\r", "", $string);
+
+        return $string;
+    }
+
     public function testObjectFilter() {
         global $objectFilterInput, $objectFilterExpected;
 
         $behavior = new MockEncryptionBehavior();
 
         $behavior->objectFilter($objectFilterInput);
 
-        $this->assertEquals($objectFilterExpected, $objectFilterInput);
+        $this->assertEquals(
+            $this->normalizeWhitespace($objectFilterExpected),
+            $this->normalizeWhitespace($objectFilterInput)
+        );
     }
 
     public function testMapFilter() {
@@ -166,11 +176,17 @@ public function testMapFilter() {
 
         // Run table map filter once, and an encrypted columns declaration is created
         $behavior->tableMapFilter($mapFilterInput);
-        $this->assertEquals(trim($mapFilterExpected), trim($mapFilterInput));
+        $this->assertEquals(
+            $this->normalizeWhitespace($mapFilterExpected),
+            $this->normalizeWhitespace($mapFilterInput)
+        );
 
         // Run it twice, and the new column name is inserted beside the old
         $behavior->tableMapFilter($mapFilterInput);
-        $this->assertEquals(trim($mapFilterExpectedSecond), trim($mapFilterInput));
+        $this->assertEquals(
+            $this->normalizeWhitespace($mapFilterExpectedSecond),
+            $this->normalizeWhitespace($mapFilterInput)
+        );
     }
 
 }