Skip to content

Исправлена ошибка в JSON-serializer #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
extead wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Исправлена ошибка в JSON-serializer #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af560a3
Update Json.php
extead Aug 2, 2013
182553a
Update Json.php
extead Aug 2, 2013
b240553
Правки для работы с Yii
extead Jan 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion library/Rediska.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?php

// Register autoloader
spl_autoload_unregister(array('YiiBase','autoload'));

require_once dirname(__FILE__) . '/Rediska/Autoloader.php';
Rediska_Autoloader::register();

spl_autoload_register(array('YiiBase', 'autoload'));

/**
* Rediska (radish on russian) - PHP client
* for key-value database Redis (http://code.google.com/p/redis)
Expand Down
14 changes: 8 additions & 6 deletions library/Rediska/Serializer/Adapter/Json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,18 @@ public function serialize($value)
* Unserialize value
*
* @param mixed $value
* @return string
* @return array
*/
public function unserialize($value)
{
$decodedValue = json_decode($value);
$decodedValue = json_decode($value, true);

if ($decodedValue === null && $value !== 'null') {
if ($decodedValue === null && $value !== 'null' || json_last_error() != JSON_ERROR_NONE) {
throw new Rediska_Serializer_Adapter_Exception("Can't unserialize value");
}

return $value;

if (is_array($decodedValue)) return $decodedValue;

return $value;
}
}
}