summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-10-13 17:54:21 +0200
committerGitHub <noreply@github.com>2020-10-13 17:54:21 +0200
commita70f283734ab0611589221bb3f9188e9fce24327 (patch)
tree55926cd952738ab90a53bfa5b7fa6d75fcc6d346
parent776c65de99350dc85704d242f433588cbb8f710d (diff)
parent0da89c0fa1609de994a6ba92b67f2d382d27c98e (diff)
downloadnextcloud-server-a70f283734ab0611589221bb3f9188e9fce24327.tar.gz
nextcloud-server-a70f283734ab0611589221bb3f9188e9fce24327.zip
Merge pull request #23409 from nextcloud/fix/cache-entry-array-access
The file cache entry is array accessible
-rw-r--r--lib/private/Files/Cache/CacheEntry.php2
-rw-r--r--lib/public/Files/Cache/ICacheEntry.php8
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/Files/Cache/CacheEntry.php b/lib/private/Files/Cache/CacheEntry.php
index 744b88b5b51..a0ba9020909 100644
--- a/lib/private/Files/Cache/CacheEntry.php
+++ b/lib/private/Files/Cache/CacheEntry.php
@@ -27,7 +27,7 @@ use OCP\Files\Cache\ICacheEntry;
/**
* meta data for a file or folder
*/
-class CacheEntry implements ICacheEntry, \ArrayAccess {
+class CacheEntry implements ICacheEntry {
/**
* @var array
*/
diff --git a/lib/public/Files/Cache/ICacheEntry.php b/lib/public/Files/Cache/ICacheEntry.php
index e3efe679cde..7a0e22496e0 100644
--- a/lib/public/Files/Cache/ICacheEntry.php
+++ b/lib/public/Files/Cache/ICacheEntry.php
@@ -23,12 +23,18 @@
namespace OCP\Files\Cache;
+use ArrayAccess;
+
/**
* meta data for a file or folder
*
* @since 9.0.0
+ *
+ * This interface extends \ArrayAccess since v21.0.0, previous versions only
+ * implemented it in the private implementation. Hence php would allow using the
+ * object as array, while strictly speaking it didn't support this.
*/
-interface ICacheEntry {
+interface ICacheEntry extends ArrayAccess {
public const DIRECTORY_MIMETYPE = 'httpd/unix-directory';
/**