@@ -32,24 +32,24 @@ |
||
| 32 | 32 | * @since 24.0.0 |
| 33 | 33 | */ |
| 34 | 34 | class InvalidateMountCacheEvent extends Event { |
| 35 | - private ?IUser $user; |
|
| 35 | + private ?IUser $user; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param IUser|null $user user |
|
| 39 | - * |
|
| 40 | - * @since 24.0.0 |
|
| 41 | - */ |
|
| 42 | - public function __construct(?IUser $user) { |
|
| 43 | - parent::__construct(); |
|
| 44 | - $this->user = $user; |
|
| 45 | - } |
|
| 37 | + /** |
|
| 38 | + * @param IUser|null $user user |
|
| 39 | + * |
|
| 40 | + * @since 24.0.0 |
|
| 41 | + */ |
|
| 42 | + public function __construct(?IUser $user) { |
|
| 43 | + parent::__construct(); |
|
| 44 | + $this->user = $user; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @return IUser|null user |
|
| 49 | - * |
|
| 50 | - * @since 24.0.0 |
|
| 51 | - */ |
|
| 52 | - public function getUser(): ?IUser { |
|
| 53 | - return $this->user; |
|
| 54 | - } |
|
| 47 | + /** |
|
| 48 | + * @return IUser|null user |
|
| 49 | + * |
|
| 50 | + * @since 24.0.0 |
|
| 51 | + */ |
|
| 52 | + public function getUser(): ?IUser { |
|
| 53 | + return $this->user; |
|
| 54 | + } |
|
| 55 | 55 | } |
@@ -32,22 +32,22 @@ |
||
| 32 | 32 | |
| 33 | 33 | class Version010402Date20190107124745 extends SimpleMigrationStep { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param IOutput $output |
|
| 37 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 38 | - * @param array $options |
|
| 39 | - * @return null|ISchemaWrapper |
|
| 40 | - */ |
|
| 41 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 42 | - /** @var ISchemaWrapper $schema */ |
|
| 43 | - $schema = $schemaClosure(); |
|
| 35 | + /** |
|
| 36 | + * @param IOutput $output |
|
| 37 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 38 | + * @param array $options |
|
| 39 | + * @return null|ISchemaWrapper |
|
| 40 | + */ |
|
| 41 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 42 | + /** @var ISchemaWrapper $schema */ |
|
| 43 | + $schema = $schemaClosure(); |
|
| 44 | 44 | |
| 45 | - // During an ownCloud migration, the client_identifier column identifier might not exist yet. |
|
| 46 | - if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) { |
|
| 47 | - $table = $schema->getTable('oauth2_clients'); |
|
| 48 | - $table->dropIndex('oauth2_client_id_idx'); |
|
| 49 | - $table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx'); |
|
| 50 | - return $schema; |
|
| 51 | - } |
|
| 52 | - } |
|
| 45 | + // During an ownCloud migration, the client_identifier column identifier might not exist yet. |
|
| 46 | + if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) { |
|
| 47 | + $table = $schema->getTable('oauth2_clients'); |
|
| 48 | + $table->dropIndex('oauth2_client_id_idx'); |
|
| 49 | + $table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx'); |
|
| 50 | + return $schema; |
|
| 51 | + } |
|
| 52 | + } |
|
| 53 | 53 | } |
@@ -32,68 +32,68 @@ |
||
| 32 | 32 | use OCP\Migration\IOutput; |
| 33 | 33 | |
| 34 | 34 | class Version1130Date20220110154718 extends GroupMappingMigration { |
| 35 | - public function getName() { |
|
| 36 | - return 'Copy ldap_group_mapping data from backup table and if needed'; |
|
| 37 | - } |
|
| 35 | + public function getName() { |
|
| 36 | + return 'Copy ldap_group_mapping data from backup table and if needed'; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param IOutput $output |
|
| 41 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 42 | - * @param array $options |
|
| 43 | - * @return null|ISchemaWrapper |
|
| 44 | - */ |
|
| 45 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
| 46 | - /** @var ISchemaWrapper $schema */ |
|
| 47 | - $schema = $schemaClosure(); |
|
| 39 | + /** |
|
| 40 | + * @param IOutput $output |
|
| 41 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 42 | + * @param array $options |
|
| 43 | + * @return null|ISchemaWrapper |
|
| 44 | + */ |
|
| 45 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
| 46 | + /** @var ISchemaWrapper $schema */ |
|
| 47 | + $schema = $schemaClosure(); |
|
| 48 | 48 | |
| 49 | - if (!$schema->hasTable('ldap_group_mapping_backup')) { |
|
| 50 | - // Backup table does not exist |
|
| 51 | - return null; |
|
| 52 | - } |
|
| 49 | + if (!$schema->hasTable('ldap_group_mapping_backup')) { |
|
| 50 | + // Backup table does not exist |
|
| 51 | + return null; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - $table = $schema->createTable('ldap_group_mapping'); |
|
| 55 | - $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 56 | - 'notnull' => true, |
|
| 57 | - 'length' => 4000, |
|
| 58 | - 'default' => '', |
|
| 59 | - ]); |
|
| 60 | - $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 61 | - 'notnull' => true, |
|
| 62 | - 'length' => 64, |
|
| 63 | - 'default' => '', |
|
| 64 | - ]); |
|
| 65 | - $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 66 | - 'notnull' => true, |
|
| 67 | - 'length' => 255, |
|
| 68 | - 'default' => '', |
|
| 69 | - ]); |
|
| 70 | - $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 71 | - 'notnull' => false, |
|
| 72 | - 'length' => 64, |
|
| 73 | - ]); |
|
| 74 | - $table->setPrimaryKey(['owncloud_name']); |
|
| 75 | - $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes'); |
|
| 76 | - $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid'); |
|
| 54 | + $table = $schema->createTable('ldap_group_mapping'); |
|
| 55 | + $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 56 | + 'notnull' => true, |
|
| 57 | + 'length' => 4000, |
|
| 58 | + 'default' => '', |
|
| 59 | + ]); |
|
| 60 | + $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 61 | + 'notnull' => true, |
|
| 62 | + 'length' => 64, |
|
| 63 | + 'default' => '', |
|
| 64 | + ]); |
|
| 65 | + $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 66 | + 'notnull' => true, |
|
| 67 | + 'length' => 255, |
|
| 68 | + 'default' => '', |
|
| 69 | + ]); |
|
| 70 | + $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 71 | + 'notnull' => false, |
|
| 72 | + 'length' => 64, |
|
| 73 | + ]); |
|
| 74 | + $table->setPrimaryKey(['owncloud_name']); |
|
| 75 | + $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes'); |
|
| 76 | + $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid'); |
|
| 77 | 77 | |
| 78 | - return $schema; |
|
| 79 | - } |
|
| 78 | + return $schema; |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * @param IOutput $output |
|
| 83 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 84 | - * @param array $options |
|
| 85 | - */ |
|
| 86 | - public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 87 | - /** @var ISchemaWrapper $schema */ |
|
| 88 | - $schema = $schemaClosure(); |
|
| 81 | + /** |
|
| 82 | + * @param IOutput $output |
|
| 83 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 84 | + * @param array $options |
|
| 85 | + */ |
|
| 86 | + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 87 | + /** @var ISchemaWrapper $schema */ |
|
| 88 | + $schema = $schemaClosure(); |
|
| 89 | 89 | |
| 90 | - if (!$schema->hasTable('ldap_group_mapping_backup')) { |
|
| 91 | - // Backup table does not exist |
|
| 92 | - return; |
|
| 93 | - } |
|
| 90 | + if (!$schema->hasTable('ldap_group_mapping_backup')) { |
|
| 91 | + // Backup table does not exist |
|
| 92 | + return; |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - $output->startProgress(); |
|
| 96 | - $this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping'); |
|
| 97 | - $output->finishProgress(); |
|
| 98 | - } |
|
| 95 | + $output->startProgress(); |
|
| 96 | + $this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping'); |
|
| 97 | + $output->finishProgress(); |
|
| 98 | + } |
|
| 99 | 99 | } |
@@ -33,80 +33,80 @@ |
||
| 33 | 33 | use OCP\Migration\SimpleMigrationStep; |
| 34 | 34 | |
| 35 | 35 | class Version1010Date20200630192842 extends SimpleMigrationStep { |
| 36 | - /** |
|
| 37 | - * @param IOutput $output |
|
| 38 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 39 | - * @param array $options |
|
| 40 | - * @return null|ISchemaWrapper |
|
| 41 | - */ |
|
| 42 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 43 | - /** @var ISchemaWrapper $schema */ |
|
| 44 | - $schema = $schemaClosure(); |
|
| 36 | + /** |
|
| 37 | + * @param IOutput $output |
|
| 38 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 39 | + * @param array $options |
|
| 40 | + * @return null|ISchemaWrapper |
|
| 41 | + */ |
|
| 42 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) { |
|
| 43 | + /** @var ISchemaWrapper $schema */ |
|
| 44 | + $schema = $schemaClosure(); |
|
| 45 | 45 | |
| 46 | - if (!$schema->hasTable('ldap_user_mapping')) { |
|
| 47 | - $table = $schema->createTable('ldap_user_mapping'); |
|
| 48 | - $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 49 | - 'notnull' => true, |
|
| 50 | - 'length' => 4000, |
|
| 51 | - 'default' => '', |
|
| 52 | - ]); |
|
| 53 | - $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 54 | - 'notnull' => true, |
|
| 55 | - 'length' => 64, |
|
| 56 | - 'default' => '', |
|
| 57 | - ]); |
|
| 58 | - $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 59 | - 'notnull' => true, |
|
| 60 | - 'length' => 255, |
|
| 61 | - 'default' => '', |
|
| 62 | - ]); |
|
| 63 | - $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 64 | - 'notnull' => false, |
|
| 65 | - 'length' => 64, |
|
| 66 | - ]); |
|
| 67 | - $table->setPrimaryKey(['owncloud_name']); |
|
| 68 | - $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes'); |
|
| 69 | - $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid'); |
|
| 70 | - } |
|
| 46 | + if (!$schema->hasTable('ldap_user_mapping')) { |
|
| 47 | + $table = $schema->createTable('ldap_user_mapping'); |
|
| 48 | + $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 49 | + 'notnull' => true, |
|
| 50 | + 'length' => 4000, |
|
| 51 | + 'default' => '', |
|
| 52 | + ]); |
|
| 53 | + $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 54 | + 'notnull' => true, |
|
| 55 | + 'length' => 64, |
|
| 56 | + 'default' => '', |
|
| 57 | + ]); |
|
| 58 | + $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 59 | + 'notnull' => true, |
|
| 60 | + 'length' => 255, |
|
| 61 | + 'default' => '', |
|
| 62 | + ]); |
|
| 63 | + $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 64 | + 'notnull' => false, |
|
| 65 | + 'length' => 64, |
|
| 66 | + ]); |
|
| 67 | + $table->setPrimaryKey(['owncloud_name']); |
|
| 68 | + $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_user_dn_hashes'); |
|
| 69 | + $table->addUniqueIndex(['directory_uuid'], 'ldap_user_directory_uuid'); |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - if (!$schema->hasTable('ldap_group_mapping')) { |
|
| 73 | - $table = $schema->createTable('ldap_group_mapping'); |
|
| 74 | - $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 75 | - 'notnull' => true, |
|
| 76 | - 'length' => 4000, |
|
| 77 | - 'default' => '', |
|
| 78 | - ]); |
|
| 79 | - $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 80 | - 'notnull' => true, |
|
| 81 | - 'length' => 64, |
|
| 82 | - 'default' => '', |
|
| 83 | - ]); |
|
| 84 | - $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 85 | - 'notnull' => true, |
|
| 86 | - 'length' => 255, |
|
| 87 | - 'default' => '', |
|
| 88 | - ]); |
|
| 89 | - $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 90 | - 'notnull' => false, |
|
| 91 | - 'length' => 64, |
|
| 92 | - ]); |
|
| 93 | - $table->setPrimaryKey(['owncloud_name']); |
|
| 94 | - $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes'); |
|
| 95 | - $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid'); |
|
| 96 | - } |
|
| 72 | + if (!$schema->hasTable('ldap_group_mapping')) { |
|
| 73 | + $table = $schema->createTable('ldap_group_mapping'); |
|
| 74 | + $table->addColumn('ldap_dn', Types::STRING, [ |
|
| 75 | + 'notnull' => true, |
|
| 76 | + 'length' => 4000, |
|
| 77 | + 'default' => '', |
|
| 78 | + ]); |
|
| 79 | + $table->addColumn('owncloud_name', Types::STRING, [ |
|
| 80 | + 'notnull' => true, |
|
| 81 | + 'length' => 64, |
|
| 82 | + 'default' => '', |
|
| 83 | + ]); |
|
| 84 | + $table->addColumn('directory_uuid', Types::STRING, [ |
|
| 85 | + 'notnull' => true, |
|
| 86 | + 'length' => 255, |
|
| 87 | + 'default' => '', |
|
| 88 | + ]); |
|
| 89 | + $table->addColumn('ldap_dn_hash', Types::STRING, [ |
|
| 90 | + 'notnull' => false, |
|
| 91 | + 'length' => 64, |
|
| 92 | + ]); |
|
| 93 | + $table->setPrimaryKey(['owncloud_name']); |
|
| 94 | + $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes'); |
|
| 95 | + $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid'); |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - if (!$schema->hasTable('ldap_group_members')) { |
|
| 99 | - $table = $schema->createTable('ldap_group_members'); |
|
| 100 | - $table->addColumn('owncloudname', Types::STRING, [ |
|
| 101 | - 'notnull' => true, |
|
| 102 | - 'length' => 255, |
|
| 103 | - 'default' => '', |
|
| 104 | - ]); |
|
| 105 | - $table->addColumn('owncloudusers', Types::TEXT, [ |
|
| 106 | - 'notnull' => true, |
|
| 107 | - ]); |
|
| 108 | - $table->setPrimaryKey(['owncloudname']); |
|
| 109 | - } |
|
| 110 | - return $schema; |
|
| 111 | - } |
|
| 98 | + if (!$schema->hasTable('ldap_group_members')) { |
|
| 99 | + $table = $schema->createTable('ldap_group_members'); |
|
| 100 | + $table->addColumn('owncloudname', Types::STRING, [ |
|
| 101 | + 'notnull' => true, |
|
| 102 | + 'length' => 255, |
|
| 103 | + 'default' => '', |
|
| 104 | + ]); |
|
| 105 | + $table->addColumn('owncloudusers', Types::TEXT, [ |
|
| 106 | + 'notnull' => true, |
|
| 107 | + ]); |
|
| 108 | + $table->setPrimaryKey(['owncloudname']); |
|
| 109 | + } |
|
| 110 | + return $schema; |
|
| 111 | + } |
|
| 112 | 112 | } |
@@ -31,24 +31,24 @@ |
||
| 31 | 31 | |
| 32 | 32 | class Version1016Date20220324154536 extends SimpleMigrationStep { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @param IOutput $output |
|
| 36 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 37 | - * @param array $options |
|
| 38 | - * @return null|ISchemaWrapper |
|
| 39 | - */ |
|
| 40 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
| 41 | - /** @var ISchemaWrapper $schema */ |
|
| 42 | - $schema = $schemaClosure(); |
|
| 43 | - |
|
| 44 | - $table = $schema->getTable('external_config'); |
|
| 45 | - $column = $table->getColumn('value'); |
|
| 46 | - |
|
| 47 | - if ($column->getLength() > 4000) { |
|
| 48 | - $column->setLength(4000); |
|
| 49 | - return $schema; |
|
| 50 | - } |
|
| 51 | - |
|
| 52 | - return null; |
|
| 53 | - } |
|
| 34 | + /** |
|
| 35 | + * @param IOutput $output |
|
| 36 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
| 37 | + * @param array $options |
|
| 38 | + * @return null|ISchemaWrapper |
|
| 39 | + */ |
|
| 40 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { |
|
| 41 | + /** @var ISchemaWrapper $schema */ |
|
| 42 | + $schema = $schemaClosure(); |
|
| 43 | + |
|
| 44 | + $table = $schema->getTable('external_config'); |
|
| 45 | + $column = $table->getColumn('value'); |
|
| 46 | + |
|
| 47 | + if ($column->getLength() > 4000) { |
|
| 48 | + $column->setLength(4000); |
|
| 49 | + return $schema; |
|
| 50 | + } |
|
| 51 | + |
|
| 52 | + return null; |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -36,52 +36,52 @@ |
||
| 36 | 36 | * @since 24.0.0 |
| 37 | 37 | */ |
| 38 | 38 | abstract class AbstractDataCollector implements IDataCollector, \JsonSerializable { |
| 39 | - /** @var array */ |
|
| 40 | - protected $data = []; |
|
| 39 | + /** @var array */ |
|
| 40 | + protected $data = []; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @since 24.0.0 |
|
| 44 | - */ |
|
| 45 | - public function getName(): string { |
|
| 46 | - return static::class; |
|
| 47 | - } |
|
| 42 | + /** |
|
| 43 | + * @since 24.0.0 |
|
| 44 | + */ |
|
| 45 | + public function getName(): string { |
|
| 46 | + return static::class; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Reset the state of the profiler. By default it only empties the |
|
| 51 | - * $this->data contents, but you can override this method to do |
|
| 52 | - * additional cleaning. |
|
| 53 | - * @since 24.0.0 |
|
| 54 | - */ |
|
| 55 | - public function reset(): void { |
|
| 56 | - $this->data = []; |
|
| 57 | - } |
|
| 49 | + /** |
|
| 50 | + * Reset the state of the profiler. By default it only empties the |
|
| 51 | + * $this->data contents, but you can override this method to do |
|
| 52 | + * additional cleaning. |
|
| 53 | + * @since 24.0.0 |
|
| 54 | + */ |
|
| 55 | + public function reset(): void { |
|
| 56 | + $this->data = []; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * @since 24.0.0 |
|
| 61 | - */ |
|
| 62 | - public function __sleep(): array { |
|
| 63 | - return ['data']; |
|
| 64 | - } |
|
| 59 | + /** |
|
| 60 | + * @since 24.0.0 |
|
| 61 | + */ |
|
| 62 | + public function __sleep(): array { |
|
| 63 | + return ['data']; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @internal to prevent implementing \Serializable |
|
| 68 | - * @since 24.0.0 |
|
| 69 | - */ |
|
| 70 | - final protected function serialize() { |
|
| 71 | - } |
|
| 66 | + /** |
|
| 67 | + * @internal to prevent implementing \Serializable |
|
| 68 | + * @since 24.0.0 |
|
| 69 | + */ |
|
| 70 | + final protected function serialize() { |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * @internal to prevent implementing \Serializable |
|
| 75 | - * @since 24.0.0 |
|
| 76 | - */ |
|
| 77 | - final protected function unserialize(string $data) { |
|
| 78 | - } |
|
| 73 | + /** |
|
| 74 | + * @internal to prevent implementing \Serializable |
|
| 75 | + * @since 24.0.0 |
|
| 76 | + */ |
|
| 77 | + final protected function unserialize(string $data) { |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * @since 24.0.0 |
|
| 82 | - */ |
|
| 83 | - #[\ReturnTypeWillChange] |
|
| 84 | - public function jsonSerialize() { |
|
| 85 | - return $this->data; |
|
| 86 | - } |
|
| 80 | + /** |
|
| 81 | + * @since 24.0.0 |
|
| 82 | + */ |
|
| 83 | + #[\ReturnTypeWillChange] |
|
| 84 | + public function jsonSerialize() { |
|
| 85 | + return $this->data; |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -42,127 +42,127 @@ |
||
| 42 | 42 | * @since 24.0.0 |
| 43 | 43 | */ |
| 44 | 44 | interface IProfile { |
| 45 | - /** |
|
| 46 | - * Get the token of the profile |
|
| 47 | - * @since 24.0.0 |
|
| 48 | - */ |
|
| 49 | - public function getToken(): string; |
|
| 50 | - |
|
| 51 | - /** |
|
| 52 | - * Set the token of the profile |
|
| 53 | - * @since 24.0.0 |
|
| 54 | - */ |
|
| 55 | - public function setToken(string $token): void; |
|
| 56 | - |
|
| 57 | - /** |
|
| 58 | - * Get the time of the profile |
|
| 59 | - * @since 24.0.0 |
|
| 60 | - */ |
|
| 61 | - public function getTime(): ?int; |
|
| 62 | - |
|
| 63 | - /** |
|
| 64 | - * Set the time of the profile |
|
| 65 | - * @since 24.0.0 |
|
| 66 | - */ |
|
| 67 | - public function setTime(int $time): void; |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Get the url of the profile |
|
| 71 | - * @since 24.0.0 |
|
| 72 | - */ |
|
| 73 | - public function getUrl(): ?string; |
|
| 74 | - |
|
| 75 | - /** |
|
| 76 | - * Set the url of the profile |
|
| 77 | - * @since 24.0.0 |
|
| 78 | - */ |
|
| 79 | - public function setUrl(string $url): void; |
|
| 80 | - |
|
| 81 | - /** |
|
| 82 | - * Get the method of the profile |
|
| 83 | - * @since 24.0.0 |
|
| 84 | - */ |
|
| 85 | - public function getMethod(): ?string; |
|
| 86 | - |
|
| 87 | - /** |
|
| 88 | - * Set the method of the profile |
|
| 89 | - * @since 24.0.0 |
|
| 90 | - */ |
|
| 91 | - public function setMethod(string $method): void; |
|
| 92 | - |
|
| 93 | - /** |
|
| 94 | - * Get the status code of the profile |
|
| 95 | - * @since 24.0.0 |
|
| 96 | - */ |
|
| 97 | - public function getStatusCode(): ?int; |
|
| 98 | - |
|
| 99 | - /** |
|
| 100 | - * Set the status code of the profile |
|
| 101 | - * @since 24.0.0 |
|
| 102 | - */ |
|
| 103 | - public function setStatusCode(int $statusCode): void; |
|
| 104 | - |
|
| 105 | - /** |
|
| 106 | - * Add a data collector to the profile |
|
| 107 | - * @since 24.0.0 |
|
| 108 | - */ |
|
| 109 | - public function addCollector(IDataCollector $collector); |
|
| 110 | - |
|
| 111 | - /** |
|
| 112 | - * Get the parent profile to this profile |
|
| 113 | - * @since 24.0.0 |
|
| 114 | - */ |
|
| 115 | - public function getParent(): ?IProfile; |
|
| 116 | - |
|
| 117 | - /** |
|
| 118 | - * Set the parent profile to this profile |
|
| 119 | - * @since 24.0.0 |
|
| 120 | - */ |
|
| 121 | - public function setParent(?IProfile $parent): void; |
|
| 122 | - |
|
| 123 | - /** |
|
| 124 | - * Get the parent token to this profile |
|
| 125 | - * @since 24.0.0 |
|
| 126 | - */ |
|
| 127 | - public function getParentToken(): ?string; |
|
| 128 | - |
|
| 129 | - /** |
|
| 130 | - * Get the profile's children |
|
| 131 | - * @return IProfile[] |
|
| 132 | - * @since 24.0.0 |
|
| 133 | - **/ |
|
| 134 | - public function getChildren(): array; |
|
| 135 | - |
|
| 136 | - /** |
|
| 137 | - * Set the profile's children |
|
| 138 | - * @param IProfile[] $children |
|
| 139 | - * @since 24.0.0 |
|
| 140 | - */ |
|
| 141 | - public function setChildren(array $children): void; |
|
| 142 | - |
|
| 143 | - /** |
|
| 144 | - * Add the child profile |
|
| 145 | - * @since 24.0.0 |
|
| 146 | - */ |
|
| 147 | - public function addChild(IProfile $profile): void; |
|
| 148 | - |
|
| 149 | - /** |
|
| 150 | - * Get all the data collectors |
|
| 151 | - * @return IDataCollector[] |
|
| 152 | - * @since 24.0.0 |
|
| 153 | - */ |
|
| 154 | - public function getCollectors(): array; |
|
| 155 | - |
|
| 156 | - /** |
|
| 157 | - * Set all the data collectors |
|
| 158 | - * @param IDataCollector[] $collectors |
|
| 159 | - * @since 24.0.0 |
|
| 160 | - */ |
|
| 161 | - public function setCollectors(array $collectors): void; |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * Get a data collector by name |
|
| 165 | - * @since 24.0.0 |
|
| 166 | - */ |
|
| 167 | - public function getCollector(string $collectorName): ?IDataCollector; |
|
| 45 | + /** |
|
| 46 | + * Get the token of the profile |
|
| 47 | + * @since 24.0.0 |
|
| 48 | + */ |
|
| 49 | + public function getToken(): string; |
|
| 50 | + |
|
| 51 | + /** |
|
| 52 | + * Set the token of the profile |
|
| 53 | + * @since 24.0.0 |
|
| 54 | + */ |
|
| 55 | + public function setToken(string $token): void; |
|
| 56 | + |
|
| 57 | + /** |
|
| 58 | + * Get the time of the profile |
|
| 59 | + * @since 24.0.0 |
|
| 60 | + */ |
|
| 61 | + public function getTime(): ?int; |
|
| 62 | + |
|
| 63 | + /** |
|
| 64 | + * Set the time of the profile |
|
| 65 | + * @since 24.0.0 |
|
| 66 | + */ |
|
| 67 | + public function setTime(int $time): void; |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Get the url of the profile |
|
| 71 | + * @since 24.0.0 |
|
| 72 | + */ |
|
| 73 | + public function getUrl(): ?string; |
|
| 74 | + |
|
| 75 | + /** |
|
| 76 | + * Set the url of the profile |
|
| 77 | + * @since 24.0.0 |
|
| 78 | + */ |
|
| 79 | + public function setUrl(string $url): void; |
|
| 80 | + |
|
| 81 | + /** |
|
| 82 | + * Get the method of the profile |
|
| 83 | + * @since 24.0.0 |
|
| 84 | + */ |
|
| 85 | + public function getMethod(): ?string; |
|
| 86 | + |
|
| 87 | + /** |
|
| 88 | + * Set the method of the profile |
|
| 89 | + * @since 24.0.0 |
|
| 90 | + */ |
|
| 91 | + public function setMethod(string $method): void; |
|
| 92 | + |
|
| 93 | + /** |
|
| 94 | + * Get the status code of the profile |
|
| 95 | + * @since 24.0.0 |
|
| 96 | + */ |
|
| 97 | + public function getStatusCode(): ?int; |
|
| 98 | + |
|
| 99 | + /** |
|
| 100 | + * Set the status code of the profile |
|
| 101 | + * @since 24.0.0 |
|
| 102 | + */ |
|
| 103 | + public function setStatusCode(int $statusCode): void; |
|
| 104 | + |
|
| 105 | + /** |
|
| 106 | + * Add a data collector to the profile |
|
| 107 | + * @since 24.0.0 |
|
| 108 | + */ |
|
| 109 | + public function addCollector(IDataCollector $collector); |
|
| 110 | + |
|
| 111 | + /** |
|
| 112 | + * Get the parent profile to this profile |
|
| 113 | + * @since 24.0.0 |
|
| 114 | + */ |
|
| 115 | + public function getParent(): ?IProfile; |
|
| 116 | + |
|
| 117 | + /** |
|
| 118 | + * Set the parent profile to this profile |
|
| 119 | + * @since 24.0.0 |
|
| 120 | + */ |
|
| 121 | + public function setParent(?IProfile $parent): void; |
|
| 122 | + |
|
| 123 | + /** |
|
| 124 | + * Get the parent token to this profile |
|
| 125 | + * @since 24.0.0 |
|
| 126 | + */ |
|
| 127 | + public function getParentToken(): ?string; |
|
| 128 | + |
|
| 129 | + /** |
|
| 130 | + * Get the profile's children |
|
| 131 | + * @return IProfile[] |
|
| 132 | + * @since 24.0.0 |
|
| 133 | + **/ |
|
| 134 | + public function getChildren(): array; |
|
| 135 | + |
|
| 136 | + /** |
|
| 137 | + * Set the profile's children |
|
| 138 | + * @param IProfile[] $children |
|
| 139 | + * @since 24.0.0 |
|
| 140 | + */ |
|
| 141 | + public function setChildren(array $children): void; |
|
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * Add the child profile |
|
| 145 | + * @since 24.0.0 |
|
| 146 | + */ |
|
| 147 | + public function addChild(IProfile $profile): void; |
|
| 148 | + |
|
| 149 | + /** |
|
| 150 | + * Get all the data collectors |
|
| 151 | + * @return IDataCollector[] |
|
| 152 | + * @since 24.0.0 |
|
| 153 | + */ |
|
| 154 | + public function getCollectors(): array; |
|
| 155 | + |
|
| 156 | + /** |
|
| 157 | + * Set all the data collectors |
|
| 158 | + * @param IDataCollector[] $collectors |
|
| 159 | + * @since 24.0.0 |
|
| 160 | + */ |
|
| 161 | + public function setCollectors(array $collectors): void; |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * Get a data collector by name |
|
| 165 | + * @since 24.0.0 |
|
| 166 | + */ |
|
| 167 | + public function getCollector(string $collectorName): ?IDataCollector; |
|
| 168 | 168 | } |
@@ -35,37 +35,37 @@ |
||
| 35 | 35 | namespace OC\DB; |
| 36 | 36 | |
| 37 | 37 | final class ObjectParameter { |
| 38 | - private $object; |
|
| 39 | - private $error; |
|
| 40 | - private $stringable; |
|
| 41 | - private $class; |
|
| 38 | + private $object; |
|
| 39 | + private $error; |
|
| 40 | + private $stringable; |
|
| 41 | + private $class; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param object $object |
|
| 45 | - */ |
|
| 46 | - public function __construct($object, ?\Throwable $error) { |
|
| 47 | - $this->object = $object; |
|
| 48 | - $this->error = $error; |
|
| 49 | - $this->stringable = \is_callable([$object, '__toString']); |
|
| 50 | - $this->class = \get_class($object); |
|
| 51 | - } |
|
| 43 | + /** |
|
| 44 | + * @param object $object |
|
| 45 | + */ |
|
| 46 | + public function __construct($object, ?\Throwable $error) { |
|
| 47 | + $this->object = $object; |
|
| 48 | + $this->error = $error; |
|
| 49 | + $this->stringable = \is_callable([$object, '__toString']); |
|
| 50 | + $this->class = \get_class($object); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * @return object |
|
| 55 | - */ |
|
| 56 | - public function getObject() { |
|
| 57 | - return $this->object; |
|
| 58 | - } |
|
| 53 | + /** |
|
| 54 | + * @return object |
|
| 55 | + */ |
|
| 56 | + public function getObject() { |
|
| 57 | + return $this->object; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - public function getError(): ?\Throwable { |
|
| 61 | - return $this->error; |
|
| 62 | - } |
|
| 60 | + public function getError(): ?\Throwable { |
|
| 61 | + return $this->error; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - public function isStringable(): bool { |
|
| 65 | - return $this->stringable; |
|
| 66 | - } |
|
| 64 | + public function isStringable(): bool { |
|
| 65 | + return $this->stringable; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - public function getClass(): string { |
|
| 69 | - return $this->class; |
|
| 70 | - } |
|
| 68 | + public function getClass(): string { |
|
| 69 | + return $this->class; |
|
| 70 | + } |
|
| 71 | 71 | } |
@@ -29,140 +29,140 @@ |
||
| 29 | 29 | use OCP\Profiler\IProfile; |
| 30 | 30 | |
| 31 | 31 | class Profile implements \JsonSerializable, IProfile { |
| 32 | - private string $token; |
|
| 32 | + private string $token; |
|
| 33 | 33 | |
| 34 | - private ?int $time = null; |
|
| 34 | + private ?int $time = null; |
|
| 35 | 35 | |
| 36 | - private ?string $url = null; |
|
| 36 | + private ?string $url = null; |
|
| 37 | 37 | |
| 38 | - private ?string $method = null; |
|
| 38 | + private ?string $method = null; |
|
| 39 | 39 | |
| 40 | - private ?int $statusCode = null; |
|
| 40 | + private ?int $statusCode = null; |
|
| 41 | 41 | |
| 42 | - /** @var array<string, IDataCollector> */ |
|
| 43 | - private array $collectors = []; |
|
| 42 | + /** @var array<string, IDataCollector> */ |
|
| 43 | + private array $collectors = []; |
|
| 44 | 44 | |
| 45 | - private ?IProfile $parent = null; |
|
| 45 | + private ?IProfile $parent = null; |
|
| 46 | 46 | |
| 47 | - /** @var IProfile[] */ |
|
| 48 | - private array $children = []; |
|
| 47 | + /** @var IProfile[] */ |
|
| 48 | + private array $children = []; |
|
| 49 | 49 | |
| 50 | - public function __construct(string $token) { |
|
| 51 | - $this->token = $token; |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - public function getToken(): string { |
|
| 55 | - return $this->token; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - public function setToken(string $token): void { |
|
| 59 | - $this->token = $token; |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - public function getTime(): ?int { |
|
| 63 | - return $this->time; |
|
| 64 | - } |
|
| 65 | - |
|
| 66 | - public function setTime(int $time): void { |
|
| 67 | - $this->time = $time; |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - public function getUrl(): ?string { |
|
| 71 | - return $this->url; |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - public function setUrl(string $url): void { |
|
| 75 | - $this->url = $url; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - public function getMethod(): ?string { |
|
| 79 | - return $this->method; |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - public function setMethod(string $method): void { |
|
| 83 | - $this->method = $method; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - public function getStatusCode(): ?int { |
|
| 87 | - return $this->statusCode; |
|
| 88 | - } |
|
| 89 | - |
|
| 90 | - public function setStatusCode(int $statusCode): void { |
|
| 91 | - $this->statusCode = $statusCode; |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - public function addCollector(IDataCollector $collector) { |
|
| 95 | - $this->collectors[$collector->getName()] = $collector; |
|
| 96 | - } |
|
| 97 | - |
|
| 98 | - public function getParent(): ?IProfile { |
|
| 99 | - return $this->parent; |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - public function setParent(?IProfile $parent): void { |
|
| 103 | - $this->parent = $parent; |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - public function getParentToken(): ?string { |
|
| 107 | - return $this->parent ? $this->parent->getToken() : null; |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - /** @return IProfile[] */ |
|
| 111 | - public function getChildren(): array { |
|
| 112 | - return $this->children; |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - /** |
|
| 116 | - * @param IProfile[] $children |
|
| 117 | - */ |
|
| 118 | - public function setChildren(array $children): void { |
|
| 119 | - $this->children = []; |
|
| 120 | - foreach ($children as $child) { |
|
| 121 | - $this->addChild($child); |
|
| 122 | - } |
|
| 123 | - } |
|
| 124 | - |
|
| 125 | - public function addChild(IProfile $profile): void { |
|
| 126 | - $this->children[] = $profile; |
|
| 127 | - $profile->setParent($this); |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - /** |
|
| 131 | - * @return IDataCollector[] |
|
| 132 | - */ |
|
| 133 | - public function getCollectors(): array { |
|
| 134 | - return $this->collectors; |
|
| 135 | - } |
|
| 136 | - |
|
| 137 | - /** |
|
| 138 | - * @param IDataCollector[] $collectors |
|
| 139 | - */ |
|
| 140 | - public function setCollectors(array $collectors): void { |
|
| 141 | - $this->collectors = $collectors; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - public function __sleep(): array { |
|
| 145 | - return ['token', 'parent', 'children', 'collectors', 'method', 'url', 'time', 'statusCode']; |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - #[\ReturnTypeWillChange] |
|
| 149 | - public function jsonSerialize() { |
|
| 150 | - // Everything but parent |
|
| 151 | - return [ |
|
| 152 | - 'token' => $this->token, |
|
| 153 | - 'method' => $this->method, |
|
| 154 | - 'children' => $this->children, |
|
| 155 | - 'url' => $this->url, |
|
| 156 | - 'statusCode' => $this->statusCode, |
|
| 157 | - 'time' => $this->time, |
|
| 158 | - 'collectors' => $this->collectors, |
|
| 159 | - ]; |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - public function getCollector(string $collectorName): ?IDataCollector { |
|
| 163 | - if (!array_key_exists($collectorName, $this->collectors)) { |
|
| 164 | - return null; |
|
| 165 | - } |
|
| 166 | - return $this->collectors[$collectorName]; |
|
| 167 | - } |
|
| 50 | + public function __construct(string $token) { |
|
| 51 | + $this->token = $token; |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + public function getToken(): string { |
|
| 55 | + return $this->token; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + public function setToken(string $token): void { |
|
| 59 | + $this->token = $token; |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + public function getTime(): ?int { |
|
| 63 | + return $this->time; |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + public function setTime(int $time): void { |
|
| 67 | + $this->time = $time; |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + public function getUrl(): ?string { |
|
| 71 | + return $this->url; |
|
| 72 | + } |
|
| 73 | + |
|
| 74 | + public function setUrl(string $url): void { |
|
| 75 | + $this->url = $url; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + public function getMethod(): ?string { |
|
| 79 | + return $this->method; |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + public function setMethod(string $method): void { |
|
| 83 | + $this->method = $method; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + public function getStatusCode(): ?int { |
|
| 87 | + return $this->statusCode; |
|
| 88 | + } |
|
| 89 | + |
|
| 90 | + public function setStatusCode(int $statusCode): void { |
|
| 91 | + $this->statusCode = $statusCode; |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + public function addCollector(IDataCollector $collector) { |
|
| 95 | + $this->collectors[$collector->getName()] = $collector; |
|
| 96 | + } |
|
| 97 | + |
|
| 98 | + public function getParent(): ?IProfile { |
|
| 99 | + return $this->parent; |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + public function setParent(?IProfile $parent): void { |
|
| 103 | + $this->parent = $parent; |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + public function getParentToken(): ?string { |
|
| 107 | + return $this->parent ? $this->parent->getToken() : null; |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + /** @return IProfile[] */ |
|
| 111 | + public function getChildren(): array { |
|
| 112 | + return $this->children; |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + /** |
|
| 116 | + * @param IProfile[] $children |
|
| 117 | + */ |
|
| 118 | + public function setChildren(array $children): void { |
|
| 119 | + $this->children = []; |
|
| 120 | + foreach ($children as $child) { |
|
| 121 | + $this->addChild($child); |
|
| 122 | + } |
|
| 123 | + } |
|
| 124 | + |
|
| 125 | + public function addChild(IProfile $profile): void { |
|
| 126 | + $this->children[] = $profile; |
|
| 127 | + $profile->setParent($this); |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + /** |
|
| 131 | + * @return IDataCollector[] |
|
| 132 | + */ |
|
| 133 | + public function getCollectors(): array { |
|
| 134 | + return $this->collectors; |
|
| 135 | + } |
|
| 136 | + |
|
| 137 | + /** |
|
| 138 | + * @param IDataCollector[] $collectors |
|
| 139 | + */ |
|
| 140 | + public function setCollectors(array $collectors): void { |
|
| 141 | + $this->collectors = $collectors; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + public function __sleep(): array { |
|
| 145 | + return ['token', 'parent', 'children', 'collectors', 'method', 'url', 'time', 'statusCode']; |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + #[\ReturnTypeWillChange] |
|
| 149 | + public function jsonSerialize() { |
|
| 150 | + // Everything but parent |
|
| 151 | + return [ |
|
| 152 | + 'token' => $this->token, |
|
| 153 | + 'method' => $this->method, |
|
| 154 | + 'children' => $this->children, |
|
| 155 | + 'url' => $this->url, |
|
| 156 | + 'statusCode' => $this->statusCode, |
|
| 157 | + 'time' => $this->time, |
|
| 158 | + 'collectors' => $this->collectors, |
|
| 159 | + ]; |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + public function getCollector(string $collectorName): ?IDataCollector { |
|
| 163 | + if (!array_key_exists($collectorName, $this->collectors)) { |
|
| 164 | + return null; |
|
| 165 | + } |
|
| 166 | + return $this->collectors[$collectorName]; |
|
| 167 | + } |
|
| 168 | 168 | } |