diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-11-23 16:14:09 +0300 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-11-24 13:06:47 +0300 |
| commit | c15fd29d395595625d35e9cfdfc477ab58397f2f (patch) | |
| tree | 2dc755c68cd0c3c78006492f541660dfc1982474 | |
| parent | c17a9940e8e9eb8ce40749103c8795eb104a9ebd (diff) | |
Prepare object id to be a string e.g. for files and shares
| -rwxr-xr-x | appinfo/database.xml | 5 | ||||
| -rw-r--r-- | appinfo/info.xml | 6 | ||||
| -rw-r--r-- | lib/handler.php | 4 | ||||
| -rw-r--r-- | tests/unit/lib/HandlerTest.php | 6 |
4 files changed, 10 insertions, 11 deletions
diff --git a/appinfo/database.xml b/appinfo/database.xml index dd16179..c2b75f3 100755 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -42,10 +42,9 @@ </field> <field> <name>object_id</name> - <type>integer</type> - <default>0</default> + <type>text</type> <notnull>true</notnull> - <length>4</length> + <length>64</length> </field> <field> <name>subject</name> diff --git a/appinfo/info.xml b/appinfo/info.xml index ade32f7..146b25f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,7 +6,7 @@ <licence>AGPL</licence> <author>Joas Schilling</author> - <version>0.2.1</version> + <version>0.2.2</version> <!-- FIXME --> <types> @@ -16,7 +16,7 @@ <default_enable/> <dependencies> - <owncloud min-version="8.2" /> - <owncloud max-version="8.3" /> + <owncloud min-version="9.0" /> + <owncloud max-version="9.0" /> </dependencies> </info> diff --git a/lib/handler.php b/lib/handler.php index c8f7831..6f185f8 100644 --- a/lib/handler.php +++ b/lib/handler.php @@ -186,7 +186,7 @@ class Handler { ->setParameter('objectType', $notification->getObjectType()); } - if ($notification->getObjectId() !== 0) { + if ($notification->getObjectId() !== '') { $sql->andWhere($sql->expr()->eq('object_id', $sql->createParameter('objectId'))) ->setParameter('objectId', $notification->getObjectId()); } @@ -272,7 +272,7 @@ class Handler { $notification->setApp($row['app']) ->setUser($row['user']) ->setDateTime($dateTime) - ->setObject($row['object_type'], (int) $row['object_id']) + ->setObject($row['object_type'], $row['object_id']) ->setSubject($row['subject'], (array) json_decode($row['subject_parameters'], true)); if ($row['message'] !== '') { diff --git a/tests/unit/lib/HandlerTest.php b/tests/unit/lib/HandlerTest.php index afa0fcd..d95d13e 100644 --- a/tests/unit/lib/HandlerTest.php +++ b/tests/unit/lib/HandlerTest.php @@ -48,7 +48,7 @@ class HandlerTest extends TestCase { 'getUser' => 'test_user1', 'getDateTime' => new \DateTime(), 'getObjectType' => 'notification', - 'getObjectId' => 1337, + 'getObjectId' => '1337', 'getSubject' => 'subject', 'getSubjectParameters' => [], 'getMessage' => 'message', @@ -103,7 +103,7 @@ class HandlerTest extends TestCase { 'getUser' => 'test_user1', 'getDateTime' => new \DateTime(), 'getObjectType' => 'notification', - 'getObjectId' => 1337, + 'getObjectId' => '1337', 'getSubject' => 'subject', 'getSubjectParameters' => [], 'getMessage' => 'message', @@ -195,7 +195,7 @@ class HandlerTest extends TestCase { 'getUser' => '', 'getDateTime' => $defaultDateTime, 'getObjectType' => '', - 'getObjectId' => 0, + 'getObjectId' => '', 'getSubject' => '', 'getSubjectParameters' => [], 'getMessage' => '', |