move AbstractCacheEvent into OCP

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

Signed-off-by: Robin Appelman <robin@icewind.nl>

6 files changed, 12 insertions, 16 deletions

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