AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move activity event data to json instead of PHP serialization

This commit is contained in:
Frédéric Guillot 2014-12-31 15:30:21 -05:00
parent ee8ec7685f
commit c32567857d
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Model/ProjectActivity.php
View File

@ -22,7 +22,7 @@ class ProjectActivity extends Base
*
* @var integer
*/
const MAX_EVENTS = 5000;
const MAX_EVENTS = 1000;
/**
* Add a new event for the project
@ -43,7 +43,7 @@ class ProjectActivity extends Base
'creator_id' => $creator_id,
'event_name' => $event_name,
'date_creation' => time(),
'data' => serialize($data),
'data' => json_encode($data),
);
$this->cleanup(self::MAX_EVENTS - 1);
@ -91,7 +91,7 @@ class ProjectActivity extends Base
foreach ($events as &$event) {
$event += unserialize($event['data']);
$event += $this->decode($event['data']);
unset($event['data']);
$event['author'] = $event['author_name'] ?: $event['author_username'];
@ -174,4 +174,20 @@ class ProjectActivity extends Base
return '';
}
}
/**
* Decode event data, supports unserialize() and json_decode()
*
* @access public
* @param string $data Serialized data
* @return array
*/
public function decode($data)
{
if ($data{0} === 'a') {
return unserialize($data);
}
return json_decode($data, true) ?: array();
}
}

11
tests/units/ProjectActivityTest.php
View File

@ -10,6 +10,17 @@ use Model\Project;
class ProjectActivityTest extends Base
{
public function testDecode()
{
$e = new ProjectActivity($this->container);
$input = array('test');
$serialized = serialize($input);
$json = json_encode($input);
$this->assertEquals($input, $e->decode($serialized));
$this->assertEquals($input, $e->decode($json));
}
public function testCreation()
{
$e = new ProjectActivity($this->container);