Skip to content

D
doctrine-dbal
Commit a2346441 authored by Benjamin Eberlei's avatar Benjamin Eberlei
Browse files
Options

Revert "Fix for ConversionException throw when the value is empty" 

This reverts commit 869cb960.
parent 88e21fc4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
lib/Doctrine/DBAL/Types/ArrayType.php
View file @ a2346441
...@@ -38,11 +38,10 @@ class ArrayType extends Type ...@@ -38,11 +38,10 @@ class ArrayType extends Type
public function convertToPHPValue($value, \Doctrine\DBAL\Platforms\AbstractPlatform $platform) public function convertToPHPValue($value, \Doctrine\DBAL\Platforms\AbstractPlatform $platform)
{ {
if (empty($value)) { if ($value === null) {
return array(); return null;
} }
$value = (is_resource($value)) ? stream_get_contents($value) : $value; $value = (is_resource($value)) ? stream_get_contents($value) : $value;
$val = unserialize($value); $val = unserialize($value);
if ($val === false && $value != 'b:0;') { if ($val === false && $value != 'b:0;') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment