upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

fix: Adjust Entity types

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-09-19 15:46:20 +02:00
parent db94e10af0
commit 0e54c2bd43
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
10 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/contactsinteraction/lib/Db/RecentContact.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\ContactsInteraction\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method void setActorUid(string $uid)
@ -33,11 +34,11 @@ class RecentContact extends Entity {
protected int $lastContact = -1;
public function __construct() {
$this->addType('actorUid', 'string');
$this->addType('uid', 'string');
$this->addType('email', 'string');
$this->addType('federatedCloudId', 'string');
$this->addType('card', 'blob');
$this->addType('lastContact', 'int');
$this->addType('actorUid', Types::STRING);
$this->addType('uid', Types::STRING);
$this->addType('email', Types::STRING);
$this->addType('federatedCloudId', Types::STRING);
$this->addType('card', Types::BLOB);
$this->addType('lastContact', Types::INTEGER);
}
}

7
apps/dav/lib/CalDAV/Proxy/Proxy.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\DAV\CalDAV\Proxy;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method string getOwnerId()
@ -28,8 +29,8 @@ class Proxy extends Entity {
protected $permissions;
public function __construct() {
$this->addType('ownerId', 'string');
$this->addType('proxyId', 'string');
$this->addType('permissions', 'int');
$this->addType('ownerId', Types::STRING);
$this->addType('proxyId', Types::STRING);
$this->addType('permissions', Types::INTEGER);
}
}

9
apps/dav/lib/Db/Direct.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\DAV\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method string getUserId()
@ -34,9 +35,9 @@ class Direct extends Entity {
protected $expiration;
public function __construct() {
$this->addType('userId', 'string');
$this->addType('fileId', 'int');
$this->addType('token', 'string');
$this->addType('expiration', 'int');
$this->addType('userId', Types::STRING);
$this->addType('fileId', Types::INTEGER);
$this->addType('token', Types::STRING);
$this->addType('expiration', Types::INTEGER);
}
}

11
apps/oauth2/lib/Db/AccessToken.php
View file

@ -6,6 +6,7 @@
namespace OCA\OAuth2\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method int getTokenId()
@ -36,12 +37,12 @@ class AccessToken extends Entity {
protected $tokenCount;
public function __construct() {
$this->addType('id', 'int');
$this->addType('tokenId', 'int');
$this->addType('clientId', 'int');
$this->addType('id', Types::INTEGER);
$this->addType('tokenId', Types::INTEGER);
$this->addType('clientId', Types::INTEGER);
$this->addType('hashedCode', 'string');
$this->addType('encryptedToken', 'string');
$this->addType('codeCreatedAt', 'int');
$this->addType('tokenCount', 'int');
$this->addType('codeCreatedAt', Types::INTEGER);
$this->addType('tokenCount', Types::INTEGER);
}
}

3
apps/oauth2/lib/Db/Client.php
View file

@ -6,6 +6,7 @@
namespace OCA\OAuth2\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method string getClientIdentifier()
@ -28,7 +29,7 @@ class Client extends Entity {
protected $secret;
public function __construct() {
$this->addType('id', 'int');
$this->addType('id', Types::INTEGER);
$this->addType('name', 'string');
$this->addType('redirectUri', 'string');
$this->addType('clientIdentifier', 'string');

7
apps/user_status/lib/Db/UserStatus.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\UserStatus\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* Class UserStatus
@ -73,13 +74,13 @@ class UserStatus extends Entity {
public function __construct() {
$this->addType('userId', 'string');
$this->addType('status', 'string');
$this->addType('statusTimestamp', 'int');
$this->addType('statusTimestamp', Types::INTEGER);
$this->addType('isUserDefined', 'boolean');
$this->addType('messageId', 'string');
$this->addType('customIcon', 'string');
$this->addType('customMessage', 'string');
$this->addType('clearAt', 'int');
$this->addType('clearAt', Types::INTEGER);
$this->addType('isBackup', 'boolean');
$this->addType('statusMessageTimestamp', 'int');
$this->addType('statusMessageTimestamp', Types::INTEGER);
}
}

5
core/Db/LoginFlowV2.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OC\Core\Db;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* @method int getTimestamp()
@ -55,8 +56,8 @@ class LoginFlowV2 extends Entity {
protected $appPassword;
public function __construct() {
$this->addType('timestamp', 'int');
$this->addType('started', 'int');
$this->addType('timestamp', Types::INTEGER);
$this->addType('started', Types::INTEGER);
$this->addType('pollToken', 'string');
$this->addType('loginToken', 'string');
$this->addType('publicKey', 'string');

15
lib/private/Authentication/Token/PublicKeyToken.php
View file

@ -10,6 +10,7 @@ namespace OC\Authentication\Token;
use OCP\AppFramework\Db\Entity;
use OCP\Authentication\Token\IToken;
use OCP\DB\Types;
/**
* @method void setId(int $id)
@ -88,16 +89,16 @@ class PublicKeyToken extends Entity implements INamedToken, IWipeableToken {
$this->addType('passwordHash', 'string');
$this->addType('name', 'string');
$this->addType('token', 'string');
$this->addType('type', 'int');
$this->addType('remember', 'int');
$this->addType('lastActivity', 'int');
$this->addType('lastCheck', 'int');
$this->addType('type', Types::INTEGER);
$this->addType('remember', Types::INTEGER);
$this->addType('lastActivity', Types::INTEGER);
$this->addType('lastCheck', Types::INTEGER);
$this->addType('scope', 'string');
$this->addType('expires', 'int');
$this->addType('expires', Types::INTEGER);
$this->addType('publicKey', 'string');
$this->addType('privateKey', 'string');
$this->addType('version', 'int');
$this->addType('passwordInvalid', 'bool');
$this->addType('version', Types::INTEGER);
$this->addType('passwordInvalid', Types::BOOLEAN);
}
public function getId(): int {

3
lib/private/Updater/Changes.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OC\Updater;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;
/**
* Class Changes
@ -39,7 +40,7 @@ class Changes extends Entity {
public function __construct() {
$this->addType('version', 'string');
$this->addType('etag', 'string');
$this->addType('lastCheck', 'int');
$this->addType('lastCheck', Types::INTEGER);
$this->addType('data', 'string');
}
}

7
lib/public/AppFramework/Db/Entity.php
View file

@ -15,7 +15,6 @@ use function substr;
/**
* @method int getId()
* @method void setId(int $id)
* @psalm-type AllowedTypes = 'json'|'blob'|'datetime'|'string'|'int'|'integer'|'bool'|'boolean'|'float'|'double'|'array'|'object'
* @since 7.0.0
* @psalm-consistent-constructor
*/
@ -26,7 +25,7 @@ abstract class Entity {
public $id;
private array $_updatedFields = [];
/** @var array<string, AllowedTypes> */
/** @var array<string, \OCP\DB\Types::*> */
private array $_fieldTypes = ['id' => 'integer'];
/**
@ -67,7 +66,7 @@ abstract class Entity {
/**
* @return array<string, AllowedTypes> with attribute and type
* @return array<string, \OCP\DB\Types::*> with attribute and type
* @since 7.0.0
*/
public function getFieldTypes(): array {
@ -260,7 +259,7 @@ abstract class Entity {
* that value once its being returned from the database
*
* @param string $fieldName the name of the attribute
* @param AllowedTypes $type the type which will be used to match a cast
* @param \OCP\DB\Types::* $type the type which will be used to match a cast
* @since 7.0.0
*/
protected function addType(string $fieldName, string $type): void {