From 6e08014781ea0099d7e4466dd48d80af63d8ab69 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 20:39:09 +0200
Subject: [PATCH] Rename namespace to Diagnostics
---
.../{debug => diagnostics}/dummyeventlogger.php | 6 +++---
.../{debug => diagnostics}/dummyquerylogger.php | 6 +++---
lib/private/{debug => diagnostics}/event.php | 4 ++--
lib/private/{debug => diagnostics}/eventlogger.php | 8 ++++----
lib/private/{debug => diagnostics}/query.php | 4 ++--
lib/private/{debug => diagnostics}/querylogger.php | 10 +++++-----
lib/private/server.php | 14 +++++++-------
lib/public/{debug => diagnostics}/ievent.php | 2 +-
lib/public/{debug => diagnostics}/ieventlogger.php | 4 ++--
lib/public/{debug => diagnostics}/iquery.php | 2 +-
lib/public/{debug => diagnostics}/iquerylogger.php | 4 ++--
lib/public/iservercontainer.php | 4 ++--
12 files changed, 34 insertions(+), 34 deletions(-)
rename lib/private/{debug => diagnostics}/dummyeventlogger.php (85%)
rename lib/private/{debug => diagnostics}/dummyquerylogger.php (83%)
rename lib/private/{debug => diagnostics}/event.php (95%)
rename lib/private/{debug => diagnostics}/eventlogger.php (82%)
rename lib/private/{debug => diagnostics}/query.php (93%)
rename lib/private/{debug => diagnostics}/querylogger.php (83%)
rename lib/public/{debug => diagnostics}/ievent.php (94%)
rename lib/public/{debug => diagnostics}/ieventlogger.php (88%)
rename lib/public/{debug => diagnostics}/iquery.php (93%)
rename lib/public/{debug => diagnostics}/iquerylogger.php (88%)
diff --git a/lib/private/debug/dummyeventlogger.php b/lib/private/diagnostics/dummyeventlogger.php
similarity index 85%
rename from lib/private/debug/dummyeventlogger.php
rename to lib/private/diagnostics/dummyeventlogger.php
index 7aa4c21b674..f1386d2e88c 100644
--- a/lib/private/debug/dummyeventlogger.php
+++ b/lib/private/diagnostics/dummyeventlogger.php
@@ -6,9 +6,9 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
/**
* Dummy event logger that doesn't actually log anything
@@ -32,7 +32,7 @@ class DummyEventLogger implements IEventLogger {
}
/**
- * @return \OCP\Debug\IEvent[]
+ * @return \OCP\Diagnostics\IEvent[]
*/
public function getEvents(){
return array();
diff --git a/lib/private/debug/dummyquerylogger.php b/lib/private/diagnostics/dummyquerylogger.php
similarity index 83%
rename from lib/private/debug/dummyquerylogger.php
rename to lib/private/diagnostics/dummyquerylogger.php
index 0c2664e4001..1617b204e90 100644
--- a/lib/private/debug/dummyquerylogger.php
+++ b/lib/private/diagnostics/dummyquerylogger.php
@@ -6,9 +6,9 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
class DummyQueryLogger implements IQueryLogger {
/**
@@ -23,7 +23,7 @@ class DummyQueryLogger implements IQueryLogger {
}
/**
- * @return \OCP\Debug\IQuery[]
+ * @return \OCP\Diagnostics\IQuery[]
*/
public function getQueries() {
return array();
diff --git a/lib/private/debug/event.php b/lib/private/diagnostics/event.php
similarity index 95%
rename from lib/private/debug/event.php
rename to lib/private/diagnostics/event.php
index b03fdeabc14..063c0c49dc2 100644
--- a/lib/private/debug/event.php
+++ b/lib/private/diagnostics/event.php
@@ -6,9 +6,9 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IEvent;
+use OCP\Diagnostics\IEvent;
class Event implements IEvent {
/**
diff --git a/lib/private/debug/eventlogger.php b/lib/private/diagnostics/eventlogger.php
similarity index 82%
rename from lib/private/debug/eventlogger.php
rename to lib/private/diagnostics/eventlogger.php
index 2127a624ed5..46084a1d496 100644
--- a/lib/private/debug/eventlogger.php
+++ b/lib/private/diagnostics/eventlogger.php
@@ -6,13 +6,13 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
class EventLogger implements IEventLogger {
/**
- * @var \OC\Debug\Event[]
+ * @var \OC\Diagnostics\Event[]
*/
private $events = array();
@@ -28,7 +28,7 @@ class EventLogger implements IEventLogger {
}
/**
- * @return \OCP\Debug\IEvent[]
+ * @return \OCP\Diagnostics\IEvent[]
*/
public function getEvents() {
return $this->events;
diff --git a/lib/private/debug/query.php b/lib/private/diagnostics/query.php
similarity index 93%
rename from lib/private/debug/query.php
rename to lib/private/diagnostics/query.php
index 351c7d9daca..d50d7592636 100644
--- a/lib/private/debug/query.php
+++ b/lib/private/diagnostics/query.php
@@ -6,9 +6,9 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IQuery;
+use OCP\Diagnostics\IQuery;
class Query implements IQuery {
private $sql;
diff --git a/lib/private/debug/querylogger.php b/lib/private/diagnostics/querylogger.php
similarity index 83%
rename from lib/private/debug/querylogger.php
rename to lib/private/diagnostics/querylogger.php
index 990188da975..1f80f907173 100644
--- a/lib/private/debug/querylogger.php
+++ b/lib/private/diagnostics/querylogger.php
@@ -6,18 +6,18 @@
* See the COPYING-README file.
*/
-namespace OC\Debug;
+namespace OC\Diagnostics;
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
class QueryLogger implements IQueryLogger {
/**
- * @var \OC\Debug\Query
+ * @var \OC\Diagnostics\Query
*/
protected $activeQuery;
/**
- * @var \OC\Debug\Query[]
+ * @var \OC\Diagnostics\Query[]
*/
protected $queries = array();
@@ -39,7 +39,7 @@ class QueryLogger implements IQueryLogger {
}
/**
- * @return \OCP\Debug\IQuery[]
+ * @return \OCP\Diagnostics\IQuery[]
*/
public function getQueries() {
return $this->queries;
diff --git a/lib/private/server.php b/lib/private/server.php
index c0b94a5b4c3..7b8ed2cabf5 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,16 +6,16 @@ use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Cache\UserCache;
-use OC\Debug\DummyQueryLogger;
-use OC\Debug\EventLogger;
-use OC\Debug\QueryLogger;
+use OC\Diagnostics\DummyQueryLogger;
+use OC\Diagnostics\EventLogger;
+use OC\Diagnostics\QueryLogger;
use OC\Security\CertificateManager;
use OC\DB\ConnectionWrapper;
use OC\Files\Node\Root;
use OC\Files\View;
use OC\Security\Crypto;
use OC\Security\SecureRandom;
-use OC\Debug\DummyEventLogger;
+use OC\Diagnostics\DummyEventLogger;
use OCP\IServerContainer;
use OCP\ISession;
use OC\Tagging\TagMapper;
@@ -583,7 +583,7 @@ class Server extends SimpleContainer implements IServerContainer {
*
* The returned logger only logs data when debug mode is enabled
*
- * @return \OCP\Debug\IEventLogger
+ * @return \OCP\Diagnostics\IEventLogger
*/
function getEventLogger() {
return $this->query('EventLogger');
@@ -594,9 +594,9 @@ class Server extends SimpleContainer implements IServerContainer {
*
* The returned logger only logs data when debug mode is enabled
*
- * @return \OCP\Debug\IQueryLogger
+ * @return \OCP\Diagnostics\IQueryLogger
*/
function getQueryLogger() {
- return $this->query('EventLogger');
+ return $this->query('QueryLogger');
}
}
diff --git a/lib/public/debug/ievent.php b/lib/public/diagnostics/ievent.php
similarity index 94%
rename from lib/public/debug/ievent.php
rename to lib/public/diagnostics/ievent.php
index 1cebb274e58..a2a3461f68a 100644
--- a/lib/public/debug/ievent.php
+++ b/lib/public/diagnostics/ievent.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
interface IEvent {
/**
diff --git a/lib/public/debug/ieventlogger.php b/lib/public/diagnostics/ieventlogger.php
similarity index 88%
rename from lib/public/debug/ieventlogger.php
rename to lib/public/diagnostics/ieventlogger.php
index 7a7bff521db..fa5880bfea6 100644
--- a/lib/public/debug/ieventlogger.php
+++ b/lib/public/diagnostics/ieventlogger.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
interface IEventLogger {
/**
@@ -25,7 +25,7 @@ interface IEventLogger {
public function end($id);
/**
- * @return \OCP\Debug\IEvent[]
+ * @return \OCP\Diagnostics\IEvent[]
*/
public function getEvents();
}
diff --git a/lib/public/debug/iquery.php b/lib/public/diagnostics/iquery.php
similarity index 93%
rename from lib/public/debug/iquery.php
rename to lib/public/diagnostics/iquery.php
index 070c4d61196..f1111e069bb 100644
--- a/lib/public/debug/iquery.php
+++ b/lib/public/diagnostics/iquery.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
interface IQuery {
/**
diff --git a/lib/public/debug/iquerylogger.php b/lib/public/diagnostics/iquerylogger.php
similarity index 88%
rename from lib/public/debug/iquerylogger.php
rename to lib/public/diagnostics/iquerylogger.php
index fe8eae089da..0fba9eb8b10 100644
--- a/lib/public/debug/iquerylogger.php
+++ b/lib/public/diagnostics/iquerylogger.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
use Doctrine\DBAL\Logging\SQLLogger;
@@ -21,7 +21,7 @@ interface IQueryLogger extends SQLLogger {
public function stopQuery();
/**
- * @return \OCP\Debug\IQuery[]
+ * @return \OCP\Diagnostics\IQuery[]
*/
public function getQueries();
}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 97ff74385a2..55c2c89b710 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -252,7 +252,7 @@ interface IServerContainer {
/**
* Get the active event logger
*
- * @return \OCP\Debug\IEventLogger
+ * @return \OCP\Diagnostics\IEventLogger
*/
function getEventLogger();
@@ -261,7 +261,7 @@ interface IServerContainer {
*
* The returned logger only logs data when debug mode is enabled
*
- * @return \OCP\Debug\IQueryLogger
+ * @return \OCP\Diagnostics\IQueryLogger
*/
function getQueryLogger();
}
--
GitLab