move AbstractCacheEvent into OCP

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

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

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 2adc447fa2d8e0f8ea53818a61b433d31f9d61cc..64000c99aa80f1bf25205b456ddf37a25c4ebaa0 100644 (file)
--- 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 004cd5889b9898d4180f82904f1a4bdecd1b423a..a6572840be007062dda9973fdd8f007aeb5fc038 100644 (file)
--- 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 (file)
index bb7ade3..0000000
--- a/lib/private/Files/Cache/AbstractCacheEvent.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright Copyright (c) 2019 Robin Appelman <robin@icewind.nl>
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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 <http://www.gnu.org/licenses/>.
- *
- */
-
-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 (file)
index 0000000..31d3169
--- /dev/null
+++ b/lib/public/Files/Cache/AbstractCacheEvent.php
@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2019 Robin Appelman <robin@icewind.nl>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Robin Appelman <robin@icewind.nl>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+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 890d751e534b4a1abd342bbf3624bc29913b0ac8..5c57103259eda80090b0159ede894a8a3d4b3565 100644 (file)
--- 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 e9a963a78a62a8e74352c5d350f57e104ac5cc85..92075e4282b9e24e33838c9d97e297627087b153 100644 (file)
--- 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 37a336013f8fb5e78f2e758134c45fe8f2b9fe0d..94b1dd7a8b3c7b740217e4d7b48aa5affd1e4c96 100644 (file)
--- 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
  *