From 0363af37904992de5f5021d8e55e3baa8186f308 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 15 Feb 2021 14:03:08 +0100 Subject: move AbstractCacheEvent into OCP otherwise we have concrete cache events in OCP extending non OCP classes Signed-off-by: Robin Appelman --- lib/composer/composer/autoload_classmap.php | 2 +- lib/composer/composer/autoload_static.php | 2 +- lib/private/Files/Cache/AbstractCacheEvent.php | 93 --------------------- lib/public/Files/Cache/AbstractCacheEvent.php | 95 ++++++++++++++++++++++ lib/public/Files/Cache/CacheEntryInsertedEvent.php | 2 - lib/public/Files/Cache/CacheEntryRemovedEvent.php | 2 - lib/public/Files/Cache/CacheEntryUpdatedEvent.php | 2 - 7 files changed, 97 insertions(+), 101 deletions(-) delete mode 100644 lib/private/Files/Cache/AbstractCacheEvent.php create mode 100644 lib/public/Files/Cache/AbstractCacheEvent.php (limited to 'lib') diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 2adc447fa2d..64000c99aa8 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -223,6 +223,7 @@ return array( 'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php', 'OCP\\Files' => $baseDir . '/lib/public/Files.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\\CacheEntryRemovedEvent' => $baseDir . '/lib/public/Files/Cache/CacheEntryRemovedEvent.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\\Files\\AppData\\AppData' => $baseDir . '/lib/private/Files/AppData/AppData.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\\CacheEntry' => $baseDir . '/lib/private/Files/Cache/CacheEntry.php', 'OC\\Files\\Cache\\CacheQueryBuilder' => $baseDir . '/lib/private/Files/Cache/CacheQueryBuilder.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 004cd5889b9..a6572840be0 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -252,6 +252,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php', 'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.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\\CacheEntryRemovedEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Cache/CacheEntryRemovedEvent.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\\Files\\AppData\\AppData' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/AppData.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\\CacheEntry' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheEntry.php', 'OC\\Files\\Cache\\CacheQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/Files/Cache/CacheQueryBuilder.php', diff --git a/lib/private/Files/Cache/AbstractCacheEvent.php b/lib/private/Files/Cache/AbstractCacheEvent.php deleted file mode 100644 index bb7ade386e0..00000000000 --- a/lib/private/Files/Cache/AbstractCacheEvent.php +++ /dev/null @@ -1,93 +0,0 @@ - - * - * @author Joas Schilling - * @author Robin Appelman - * @author Roeland Jago Douma - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -namespace OC\Files\Cache; - -use OCP\EventDispatcher\Event; -use OCP\Files\Cache\ICacheEvent; -use OCP\Files\Storage\IStorage; - -class AbstractCacheEvent extends Event implements ICacheEvent { - protected $storage; - protected $path; - protected $fileId; - protected $storageId; - - /** - * @param IStorage $storage - * @param string $path - * @param int $fileId - * @since 16.0.0 - */ - public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) { - $this->storage = $storage; - $this->path = $path; - $this->fileId = $fileId; - $this->storageId = $storageId; - } - - /** - * @return IStorage - * @since 16.0.0 - */ - public function getStorage(): IStorage { - return $this->storage; - } - - /** - * @return string - * @since 16.0.0 - */ - public function getPath(): string { - return $this->path; - } - - /** - * @param string $path - * @since 19.0.0 - */ - public function setPath(string $path): void { - $this->path = $path; - } - - /** - * @return int - * @since 16.0.0 - */ - public function getFileId(): int { - return $this->fileId; - } - - /** - * @return int - * @since 21.0.0 - */ - public function getStorageId(): int { - return $this->storageId; - } -} diff --git a/lib/public/Files/Cache/AbstractCacheEvent.php b/lib/public/Files/Cache/AbstractCacheEvent.php new file mode 100644 index 00000000000..31d31699804 --- /dev/null +++ b/lib/public/Files/Cache/AbstractCacheEvent.php @@ -0,0 +1,95 @@ + + * + * @author Joas Schilling + * @author Robin Appelman + * @author Roeland Jago Douma + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCP\Files\Cache; + +use OCP\EventDispatcher\Event; +use OCP\Files\Storage\IStorage; + +/** + * @since 22.0.0 + */ +class AbstractCacheEvent extends Event implements ICacheEvent { + protected $storage; + protected $path; + protected $fileId; + protected $storageId; + + /** + * @param IStorage $storage + * @param string $path + * @param int $fileId + * @since 22.0.0 + */ + public function __construct(IStorage $storage, string $path, int $fileId, int $storageId) { + $this->storage = $storage; + $this->path = $path; + $this->fileId = $fileId; + $this->storageId = $storageId; + } + + /** + * @return IStorage + * @since 22.0.0 + */ + public function getStorage(): IStorage { + return $this->storage; + } + + /** + * @return string + * @since 22.0.0 + */ + public function getPath(): string { + return $this->path; + } + + /** + * @param string $path + * @since 22.0.0 + */ + public function setPath(string $path): void { + $this->path = $path; + } + + /** + * @return int + * @since 22.0.0 + */ + public function getFileId(): int { + return $this->fileId; + } + + /** + * @return int + * @since 22.0.0 + */ + public function getStorageId(): int { + return $this->storageId; + } +} diff --git a/lib/public/Files/Cache/CacheEntryInsertedEvent.php b/lib/public/Files/Cache/CacheEntryInsertedEvent.php index 890d751e534..5c57103259e 100644 --- a/lib/public/Files/Cache/CacheEntryInsertedEvent.php +++ b/lib/public/Files/Cache/CacheEntryInsertedEvent.php @@ -26,8 +26,6 @@ declare(strict_types=1); namespace OCP\Files\Cache; -use OC\Files\Cache\AbstractCacheEvent; - /** * Event for when an existing entry in the cache gets inserted * diff --git a/lib/public/Files/Cache/CacheEntryRemovedEvent.php b/lib/public/Files/Cache/CacheEntryRemovedEvent.php index e9a963a78a6..92075e4282b 100644 --- a/lib/public/Files/Cache/CacheEntryRemovedEvent.php +++ b/lib/public/Files/Cache/CacheEntryRemovedEvent.php @@ -26,8 +26,6 @@ declare(strict_types=1); namespace OCP\Files\Cache; -use OC\Files\Cache\AbstractCacheEvent; - /** * Event for when an existing entry in the cache gets removed * diff --git a/lib/public/Files/Cache/CacheEntryUpdatedEvent.php b/lib/public/Files/Cache/CacheEntryUpdatedEvent.php index 37a336013f8..94b1dd7a8b3 100644 --- a/lib/public/Files/Cache/CacheEntryUpdatedEvent.php +++ b/lib/public/Files/Cache/CacheEntryUpdatedEvent.php @@ -26,8 +26,6 @@ declare(strict_types=1); namespace OCP\Files\Cache; -use OC\Files\Cache\AbstractCacheEvent; - /** * Event for when an existing entry in the cache gets updated * -- cgit v1.2.3