Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/notifications.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-09-08 10:22:00 +0300
committerJoas Schilling <nickvergessen@owncloud.com>2015-09-08 10:22:00 +0300
commit2817f4c283fc44db265c838cb1c0c88056ec79f3 (patch)
tree987daadd9d5b076d85c00c11e76916da587d2597 /tests
parent83049bc20869588abdc3de21e5d117f5789a4b18 (diff)
Fix php7 "Redefinition of parameter $id" in unit test
Diffstat (limited to 'tests')
-rw-r--r--tests/controller/EndpointControllerTest.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/controller/EndpointControllerTest.php b/tests/controller/EndpointControllerTest.php
index 34b6cc8..bcba7a2 100644
--- a/tests/controller/EndpointControllerTest.php
+++ b/tests/controller/EndpointControllerTest.php
@@ -201,8 +201,8 @@ class EndpointControllerTest extends TestCase {
* @param string $app
* @param string $user
* @param int $timestamp
- * @param string $type
- * @param int $id
+ * @param string $objectType
+ * @param int $objectId
* @param string $subject
* @param string $message
* @param string $link
@@ -210,7 +210,7 @@ class EndpointControllerTest extends TestCase {
* @param array $actions
* @param array $actionsExpected
*/
- public function testNotificationToArray($id, $app, $user, $timestamp, $type, $id, $subject, $message, $link, $icon, array $actions, array $actionsExpected) {
+ public function testNotificationToArray($id, $app, $user, $timestamp, $objectType, $objectId, $subject, $message, $link, $icon, array $actions, array $actionsExpected) {
$notification = $this->getMockBuilder('OC\Notification\INotification')
->disableOriginalConstructor()
->getMock();
@@ -229,11 +229,11 @@ class EndpointControllerTest extends TestCase {
$notification->expects($this->once())
->method('getObjectType')
- ->willReturn($type);
+ ->willReturn($objectType);
$notification->expects($this->once())
->method('getObjectId')
- ->willReturn($id);
+ ->willReturn($objectId);
$notification->expects($this->once())
->method('getParsedSubject')
@@ -267,8 +267,8 @@ class EndpointControllerTest extends TestCase {
'app' => $app,
'user' => $user,
'timestamp' => $timestamp,
- 'object_type' => $type,
- 'object_id' => $id,
+ 'object_type' => $objectType,
+ 'object_id' => $objectId,
'subject' => $subject,
'message' => $message,
'link' => $link,