wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[stable16] Fix userid casting in notifications"

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2019-06-25 12:38:03 +02:00 committed by Roeland Jago Douma
parent cd69e9052f
commit ab13fe80e4
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Notification/Notification.php
View file

@ -1,5 +1,4 @@
<?php <?php
declare (strict_types = 1);
/** /**
* @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, ownCloud, Inc.
* *
@ -134,7 +133,7 @@ class Notification implements INotification {
* @throws \InvalidArgumentException if the app id is invalid * @throws \InvalidArgumentException if the app id is invalid
* @since 8.2.0 * @since 8.2.0
*/ */
public function setApp(string $app) { public function setApp($app) {
if (!is_string($app) || $app === '' || isset($app[32])) { if (!is_string($app) || $app === '' || isset($app[32])) {
throw new \InvalidArgumentException('The given app name is invalid'); throw new \InvalidArgumentException('The given app name is invalid');
} }
@ -156,7 +155,7 @@ class Notification implements INotification {
* @throws \InvalidArgumentException if the user id is invalid * @throws \InvalidArgumentException if the user id is invalid
* @since 8.2.0 * @since 8.2.0
*/ */
public function setUser(string $user) { public function setUser($user) {
if (!is_string($user) || $user === '' || isset($user[64])) { if (!is_string($user) || $user === '' || isset($user[64])) {
throw new \InvalidArgumentException('The given user id is invalid'); throw new \InvalidArgumentException('The given user id is invalid');
} }

5
lib/public/Notification/INotification.php
View file

@ -1,5 +1,4 @@
<?php <?php
declare (strict_types = 1);
/** /**
* @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2016, ownCloud, Inc.
* *
@ -37,7 +36,7 @@ interface INotification {
* @throws \InvalidArgumentException if the app id is invalid * @throws \InvalidArgumentException if the app id is invalid
* @since 9.0.0 * @since 9.0.0
*/ */
public function setApp(string $app); public function setApp($app);
/** /**
* @return string * @return string
@ -51,7 +50,7 @@ interface INotification {
* @throws \InvalidArgumentException if the user id is invalid * @throws \InvalidArgumentException if the user id is invalid
* @since 9.0.0 * @since 9.0.0
*/ */
public function setUser(string $user); public function setUser($user);
/** /**
* @return string * @return string