From 69592408c4ef2b891c2d73f704611d2eabe5813a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 25 Apr 2018 12:26:03 +0200
Subject: [PATCH] move IFileBased to public namespace, logreader needs it
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
lib/composer/composer/autoload_classmap.php | 2 +-
lib/composer/composer/autoload_static.php | 2 +-
lib/private/Log.php | 2 +-
lib/private/Log/File.php | 1 +
lib/{private => public}/Log/IFileBased.php | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
rename lib/{private => public}/Log/IFileBased.php (98%)
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 2c079a2c295..8bb8497eaa8 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -239,6 +239,7 @@ return array(
'OCP\\Lock\\ILockingProvider' => $baseDir . '/lib/public/Lock/ILockingProvider.php',
'OCP\\Lock\\LockedException' => $baseDir . '/lib/public/Lock/LockedException.php',
'OCP\\Lockdown\\ILockdownManager' => $baseDir . '/lib/public/Lockdown/ILockdownManager.php',
+ 'OCP\\Log\\IFileBased' => $baseDir . '/lib/public/Log/IFileBased.php',
'OCP\\Log\\ILogFactory' => $baseDir . '/lib/public/Log/ILogFactory.php',
'OCP\\Log\\IWriter' => $baseDir . '/lib/public/Log/IWriter.php',
'OCP\\Mail\\IAttachment' => $baseDir . '/lib/public/Mail/IAttachment.php',
@@ -752,7 +753,6 @@ return array(
'OC\\Log\\Errorlog' => $baseDir . '/lib/private/Log/Errorlog.php',
'OC\\Log\\ExceptionSerializer' => $baseDir . '/lib/private/Log/ExceptionSerializer.php',
'OC\\Log\\File' => $baseDir . '/lib/private/Log/File.php',
- 'OC\\Log\\IFileBased' => $baseDir . '/lib/private/Log/IFileBased.php',
'OC\\Log\\LogFactory' => $baseDir . '/lib/private/Log/LogFactory.php',
'OC\\Log\\Rotate' => $baseDir . '/lib/private/Log/Rotate.php',
'OC\\Log\\Syslog' => $baseDir . '/lib/private/Log/Syslog.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index f76c626a069..7faa6df8228 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -269,6 +269,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\Lock\\ILockingProvider' => __DIR__ . '/../../..' . '/lib/public/Lock/ILockingProvider.php',
'OCP\\Lock\\LockedException' => __DIR__ . '/../../..' . '/lib/public/Lock/LockedException.php',
'OCP\\Lockdown\\ILockdownManager' => __DIR__ . '/../../..' . '/lib/public/Lockdown/ILockdownManager.php',
+ 'OCP\\Log\\IFileBased' => __DIR__ . '/../../..' . '/lib/public/Log/IFileBased.php',
'OCP\\Log\\ILogFactory' => __DIR__ . '/../../..' . '/lib/public/Log/ILogFactory.php',
'OCP\\Log\\IWriter' => __DIR__ . '/../../..' . '/lib/public/Log/IWriter.php',
'OCP\\Mail\\IAttachment' => __DIR__ . '/../../..' . '/lib/public/Mail/IAttachment.php',
@@ -782,7 +783,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Log\\Errorlog' => __DIR__ . '/../../..' . '/lib/private/Log/Errorlog.php',
'OC\\Log\\ExceptionSerializer' => __DIR__ . '/../../..' . '/lib/private/Log/ExceptionSerializer.php',
'OC\\Log\\File' => __DIR__ . '/../../..' . '/lib/private/Log/File.php',
- 'OC\\Log\\IFileBased' => __DIR__ . '/../../..' . '/lib/private/Log/IFileBased.php',
'OC\\Log\\LogFactory' => __DIR__ . '/../../..' . '/lib/private/Log/LogFactory.php',
'OC\\Log\\Rotate' => __DIR__ . '/../../..' . '/lib/private/Log/Rotate.php',
'OC\\Log\\Syslog' => __DIR__ . '/../../..' . '/lib/private/Log/Syslog.php',
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 313201460a2..099cc56776b 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -38,7 +38,7 @@ namespace OC;
use InterfaSys\LogNormalizer\Normalizer;
use OC\Log\ExceptionSerializer;
-use OC\Log\IFileBased;
+use OCP\Log\IFileBased;
use OCP\IConfig;
use OCP\Log\IWriter;
use OCP\ILogger;
diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index 6e95de229cd..56121d21d9f 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -37,6 +37,7 @@
namespace OC\Log;
use OCP\IConfig;
+use OCP\Log\IFileBased;
use OCP\Log\IWriter;
use OCP\ILogger;
diff --git a/lib/private/Log/IFileBased.php b/lib/public/Log/IFileBased.php
similarity index 98%
rename from lib/private/Log/IFileBased.php
rename to lib/public/Log/IFileBased.php
index ae083f670e2..e4befbfd632 100644
--- a/lib/private/Log/IFileBased.php
+++ b/lib/public/Log/IFileBased.php
@@ -21,7 +21,7 @@
*
*/
-namespace OC\Log;
+namespace OCP\Log;
interface IFileBased {
public function getLogFilePath();
--
GitLab