mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move AbstractCacheEvent into OCP 

otherwise we have concrete cache events in OCP extending non OCP classes

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-02-15 14:03:08 +01:00
parent 9929adde08
commit 0363af3790
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composer/composer/autoload_classmap.php
View File

@ -223,6 +223,7 @@ return array(
'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php', 'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php',
'OCP\\Files' => $baseDir . '/lib/public/Files.php', 'OCP\\Files' => $baseDir . '/lib/public/Files.php',
'OCP\\Files\\AlreadyExistsException' => $baseDir . '/lib/public/Files/AlreadyExistsException.php', 'OCP\\Files\\AlreadyExistsException' => $baseDir . '/lib/public/Files/AlreadyExistsException.php',
'OCP\\Files\\Cache\\AbstractCacheEvent' => $baseDir . '/lib/public/Files/Cache/AbstractCacheEvent.php',
'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php', 'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php',
'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php', 'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php',
'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php', 'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php',
@ -1031,7 +1032,6 @@ return array(
'OC\\Federation\\CloudIdManager' => $baseDir . '/lib/private/Federation/CloudIdManager.php', 'OC\\Federation\\CloudIdManager' => $baseDir . '/lib/private/Federation/CloudIdManager.php',
'OC\\Files\\AppData\\AppData' => $baseDir . '/lib/private/Files/AppData/AppData.php', 'OC\\Files\\AppData\\AppData' => $baseDir . '/lib/private/Files/AppData/AppData.php',
'OC\\Files\\AppData\\Factory' => $baseDir . '/lib/private/Files/AppData/Factory.php', 'OC\\Files\\AppData\\Factory' => $baseDir . '/lib/private/Files/AppData/Factory.php',
'OC\\Files\\Cache\\AbstractCacheEvent' => $baseDir . '/lib/private/Files/Cache/AbstractCacheEvent.php',
'OC\\Files\\Cache\\Cache' => $baseDir . '/lib/private/Files/Cache/Cache.php', 'OC\\Files\\Cache\\Cache' => $baseDir . '/lib/private/Files/Cache/Cache.php',
'OC\\Files\\Cache\\CacheEntry' => $baseDir . '/lib/private/Files/Cache/CacheEntry.php', 'OC\\Files\\Cache\\CacheEntry' => $baseDir . '/lib/private/Files/Cache/CacheEntry.php',
'OC\\Files\\Cache\\CacheQueryBuilder' => $baseDir . '/lib/private/Files/Cache/CacheQueryBuilder.php', 'OC\\Files\\Cache\\CacheQueryBuilder' => $baseDir . '/lib/private/Files/Cache/CacheQueryBuilder.php',

2
lib/composer/composer/autoload_static.php
View File

@ -252,6 +252,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php', 'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php',
'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php', 'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php',
'OCP\\Files\\AlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/Files/AlreadyExistsException.php', 'OCP\\Files\\AlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/Files/AlreadyExistsException.php',
'OCP\\Files\\Cache\\AbstractCacheEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/AbstractCacheEvent.php',
'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php', 'OCP\\Files\\Cache\\CacheEntryInsertedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryInsertedEvent.php',
'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php', 'OCP\\Files\\Cache\\CacheEntryRemovedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryRemovedEvent.php',
'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php', 'OCP\\Files\\Cache\\CacheEntryUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryUpdatedEvent.php',
@ -1060,7 +1061,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Federation\\CloudIdManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudIdManager.php', 'OC\\Federation\\CloudIdManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudIdManager.php',
'OC\\Files\\AppData\\AppData' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/AppData.php', 'OC\\Files\\AppData\\AppData' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/AppData.php',
'OC\\Files\\AppData\\Factory' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/Factory.php', 'OC\\Files\\AppData\\Factory' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/Factory.php',
'OC\\Files\\Cache\\AbstractCacheEvent' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/AbstractCacheEvent.php',
'OC\\Files\\Cache\\Cache' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/Cache.php', 'OC\\Files\\Cache\\Cache' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/Cache.php',
'OC\\Files\\Cache\\CacheEntry' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheEntry.php', 'OC\\Files\\Cache\\CacheEntry' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheEntry.php',
'OC\\Files\\Cache\\CacheQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheQueryBuilder.php', 'OC\\Files\\Cache\\CacheQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheQueryBuilder.php',

18
lib/private/Files/Cache/AbstractCacheEvent.php → lib/public/Files/Cache/AbstractCacheEvent.php
View File

@ -26,12 +26,14 @@ declare(strict_types=1);
* *
*/ */
namespace OC\Files\Cache; namespace OCP\Files\Cache;
use OCP\EventDispatcher\Event; use OCP\EventDispatcher\Event;
use OCP\Files\Cache\ICacheEvent;
use OCP\Files\Storage\IStorage; use OCP\Files\Storage\IStorage;
/**
* @since 22.0.0
*/
class AbstractCacheEvent extends Event implements ICacheEvent { class AbstractCacheEvent extends Event implements ICacheEvent {
protected $storage; protected $storage;
protected $path; protected $path;
@ -42,7 +44,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
* @param IStorage $storage * @param IStorage $storage
* @param string $path * @param string $path
* @param int $fileId * @param int $fileId
* @since 16.0.0 * @since 22.0.0
*/ */
public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) { public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) {
$this->storage = $storage; $this->storage = $storage;
@ -53,7 +55,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
/** /**
* @return IStorage * @return IStorage
* @since 16.0.0 * @since 22.0.0
*/ */
public function getStorage(): IStorage { public function getStorage(): IStorage {
return $this->storage; return $this->storage;
@ -61,7 +63,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
/** /**
* @return string * @return string
* @since 16.0.0 * @since 22.0.0
*/ */
public function getPath(): string { public function getPath(): string {
return $this->path; return $this->path;
@ -69,7 +71,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
/** /**
* @param string $path * @param string $path
* @since 19.0.0 * @since 22.0.0
*/ */
public function setPath(string $path): void { public function setPath(string $path): void {
$this->path = $path; $this->path = $path;
@ -77,7 +79,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
/** /**
* @return int * @return int
* @since 16.0.0 * @since 22.0.0
*/ */
public function getFileId(): int { public function getFileId(): int {
return $this->fileId; return $this->fileId;
@ -85,7 +87,7 @@ class AbstractCacheEvent extends Event implements ICacheEvent {
/** /**
* @return int * @return int
* @since 21.0.0 * @since 22.0.0
*/ */
public function getStorageId(): int { public function getStorageId(): int {
return $this->storageId; return $this->storageId;

2
lib/public/Files/Cache/CacheEntryInsertedEvent.php
View File

@ -26,8 +26,6 @@ declare(strict_types=1);
namespace OCP\Files\Cache; namespace OCP\Files\Cache;
use OC\Files\Cache\AbstractCacheEvent;
/** /**
* Event for when an existing entry in the cache gets inserted * Event for when an existing entry in the cache gets inserted
* *

2
lib/public/Files/Cache/CacheEntryRemovedEvent.php
View File

@ -26,8 +26,6 @@ declare(strict_types=1);
namespace OCP\Files\Cache; namespace OCP\Files\Cache;
use OC\Files\Cache\AbstractCacheEvent;
/** /**
* Event for when an existing entry in the cache gets removed * Event for when an existing entry in the cache gets removed
* *

2
lib/public/Files/Cache/CacheEntryUpdatedEvent.php
View File

@ -26,8 +26,6 @@ declare(strict_types=1);
namespace OCP\Files\Cache; namespace OCP\Files\Cache;
use OC\Files\Cache\AbstractCacheEvent;
/** /**
* Event for when an existing entry in the cache gets updated * Event for when an existing entry in the cache gets updated
* *