Merge pull request #16068 from nextcloud/revert-15925-backport/15912/stable16

Revert "[stable16] Fix userid casting in notifications"
This commit is contained in:
Roeland Jago Douma 2019-06-25 13:30:33 +02:00 committed by GitHub
commit 948770205a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View File

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

View File

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