Fixes #6369

cakephp · Apr 20, 2015 · cfd5bb0 · cfd5bb0
1 parent 73d4fec
commit cfd5bb0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Network/Session/DatabaseSession.php b/src/Network/Session/DatabaseSession.php
@@ -102,7 +102,11 @@ public function read($id)
             return false;
         }
 
-        return $result['data'];
+        if (is_string($result['data'])) {
+            return $result['data'];
+        }
+
+        return stream_get_contents($result['data']);
     }
 
     /**

diff --git a/tests/Fixture/SessionsFixture.php b/tests/Fixture/SessionsFixture.php
@@ -30,7 +30,7 @@ class SessionsFixture extends TestFixture
      */
     public $fields = [
         'id' => ['type' => 'string', 'length' => 128],
-        'data' => ['type' => 'text', 'null' => true],
+        'data' => ['type' => 'binary', 'null' => true],
         'expires' => ['type' => 'integer', 'length' => 11, 'null' => true],
         '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
     ];

diff --git a/tests/TestCase/Network/Session/DatabaseSessionTest.php b/tests/TestCase/Network/Session/DatabaseSessionTest.php
@@ -175,6 +175,6 @@ public function testSerializeEntity()
         $entity->value = 'something';
         $result = $this->storage->write('key', serialize($entity));
         $data = TableRegistry::get('Sessions')->get('key')->data;
-        $this->assertEquals(serialize($entity), $data);
+        $this->assertEquals(serialize($entity), stream_get_contents($data));
     }
 }