Skip to content

Commit

Permalink
v20.0.2
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
  • Loading branch information
ChristophWurst committed Dec 23, 2020
1 parent 1bcaddc commit 8d12dba
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 9 deletions.
5 changes: 4 additions & 1 deletion OCP/AppFramework/Services/IInitialState.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

namespace OCP\AppFramework\Services;

use Closure;

/**
* @since 20.0.0
*/
Expand Down Expand Up @@ -55,6 +57,7 @@ public function provideInitialState(string $key, $data): void;
*
* @param string $key
* @param Closure $closure returns a primitive or an object that implements JsonSerializable
* @psalm-param Closure():int|Closure():float|Closure():string|Closure():\JsonSerializable $closure
*/
public function provideLazyInitialState(string $key, \Closure $closure): void;
public function provideLazyInitialState(string $key, Closure $closure): void;
}
10 changes: 4 additions & 6 deletions OCP/DB/QueryBuilder/IFunctionBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,8 @@ public function min($field);
*
* If you want to get the maximum value of all rows in a column, use `max` instead
*
* @param mixed $x the first input field or number
* @param mixed $y the first input field or number
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
* @since 18.0.0
*/
Expand All @@ -150,9 +149,8 @@ public function greatest($x, $y);
*
* If you want to get the minimum value of all rows in a column, use `min` instead
*
* @param mixed $x the first input field or number
* @param mixed $y the first input field or number
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
* @since 18.0.0
*/
Expand Down
2 changes: 1 addition & 1 deletion OCP/DB/QueryBuilder/IQueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public function addGroupBy(...$groupBy);
* </code>
*
* @param string $column The column into which the value should be inserted.
* @param string $value The value that should be inserted into the column.
* @param IParameter|string $value The value that should be inserted into the column.
*
* @return $this This QueryBuilder instance.
* @since 8.2.0
Expand Down
2 changes: 2 additions & 0 deletions OCP/EventDispatcher/IEventDispatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ interface IEventDispatcher {
* @param string $eventName preferably the fully-qualified class name of the Event sub class
* @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
* @param callable $listener the object that is invoked when a matching event is dispatched
* @psalm-param callable(T):void $listener
* @param int $priority
*
* @since 17.0.0
Expand All @@ -50,6 +51,7 @@ public function addListener(string $eventName, callable $listener, int $priority
* @param string $eventName preferably the fully-qualified class name of the Event sub class
* @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
* @param callable $listener the object that is invoked when a matching event is dispatched
* @psalm-param callable(T):void $listener
*
* @since 19.0.0
*/
Expand Down
2 changes: 2 additions & 0 deletions OCP/IDBConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
interface IDBConnection {
public const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
public const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
public const ADD_MISSING_PRIMARY_KEYS_EVENT = self::class . '::ADD_MISSING_PRIMARY_KEYS';
public const CHECK_MISSING_PRIMARY_KEYS_EVENT = self::class . '::CHECK_MISSING_PRIMARY_KEYS';
public const ADD_MISSING_COLUMNS_EVENT = self::class . '::ADD_MISSING_COLUMNS';
public const CHECK_MISSING_COLUMNS_EVENT = self::class . '::CHECK_MISSING_COLUMNS';

Expand Down
2 changes: 2 additions & 0 deletions OCP/IUserManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ public function countUsers();

/**
* @param \Closure $callback
* @psalm-param \Closure(\OCP\IUser):void $callback
* @param string $search
* @since 9.0.0
*/
Expand All @@ -178,6 +179,7 @@ public function countSeenUsers();

/**
* @param \Closure $callback
* @psalm-param \Closure(\OCP\IUser):?bool $callback
* @since 11.0.0
*/
public function callForSeenUsers(\Closure $callback);
Expand Down
10 changes: 10 additions & 0 deletions OCP/WorkflowEngine/IManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ interface IManager {
public const SCOPE_ADMIN = 0;
public const SCOPE_USER = 1;

/**
* @since 21.0.0
*/
public const MAX_CHECK_VALUE_BYTES = 2048;

/**
* @since 21.0.0
*/
public const MAX_OPERATION_VALUE_BYTES = 4096;

/**
* @depreacted Will be removed in NC19. Use the dedicated events in OCP\WorkflowEngine\Events
*/
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

rm -rf OCP
git clone --depth 1 --branch v20.0.1 https://github.com/nextcloud/server.git
git clone --depth 1 --branch v20.0.2 https://github.com/nextcloud/server.git
cp -r server/lib/public OCP
rm -rf server
git add OCP

0 comments on commit 8d12dba

Please sign in to comment.