Merge pull request #400 from cakephp/issue-392

Make panel data binary values.
cakephp · Jan 5, 2016 · 5a1f567 · 5a1f567
2 parents 816d40d + e19f55c
commit 5a1f567
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Model/Entity/Panel.php b/src/Model/Entity/Panel.php
@@ -25,4 +25,20 @@ class Panel extends Entity
      * @var array
      */
     protected $_hidden = ['content'];
+
+    /**
+     * Read the stream contents.
+     *
+     * Over certain sizes PDO will return file handles.
+     * For backwards compatibility and consistency we smooth over that difference here.
+     *
+     * @return string
+     */
+    protected function _getContent($content)
+    {
+        if (is_resource($content)) {
+            return stream_get_contents($content);
+        }
+        return $content;
+    }
 }
diff --git a/tests/Fixture/PanelsFixture.php b/tests/Fixture/PanelsFixture.php
@@ -33,7 +33,7 @@ class PanelsFixture extends TestFixture
         'title' => ['type' => 'string'],
         'element' => ['type' => 'string'],
         'summary' => ['type' => 'string'],
-        'content' => ['type' => 'text'],
+        'content' => ['type' => 'binary'],
         '_constraints' => [
             'primary' => ['type' => 'primary', 'columns' => ['id']],
             'unique_panel' => ['type' => 'unique', 'columns' => ['request_id', 'panel']],