From ba8416a04fbeb292c00cb10c215bb03fe2f2628f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 18 Aug 2014 13:43:25 +0200
Subject: [PATCH] move certificate classes to their own namespace
---
lib/private/{ => certificate}/certificate.php | 4 ++--
lib/private/{ => certificate}/certificatemanager.php | 2 +-
lib/private/server.php | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
rename lib/private/{ => certificate}/certificate.php (97%)
rename lib/private/{ => certificate}/certificatemanager.php (99%)
diff --git a/lib/private/certificate.php b/lib/private/certificate/certificate.php
similarity index 97%
rename from lib/private/certificate.php
rename to lib/private/certificate/certificate.php
index 294722bc660..801afa79167 100644
--- a/lib/private/certificate.php
+++ b/lib/private/certificate/certificate.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OC;
+namespace OC\Certificate;
use OCP\ICertificate;
@@ -75,7 +75,7 @@ class Certificate implements ICertificate {
* @return string
*/
public function getSerial() {
- return $this->getSerial();
+ return $this->serial;
}
/**
diff --git a/lib/private/certificatemanager.php b/lib/private/certificate/certificatemanager.php
similarity index 99%
rename from lib/private/certificatemanager.php
rename to lib/private/certificate/certificatemanager.php
index 90a30182c65..c6207f057dc 100644
--- a/lib/private/certificatemanager.php
+++ b/lib/private/certificate/certificatemanager.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OC;
+namespace OC\Certificate;
use OCP\ICertificateManager;
diff --git a/lib/private/server.php b/lib/private/server.php
index a30571c1e13..311001ce407 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,6 +6,7 @@ use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Cache\UserCache;
+use OC\Certificate\CertificateManager;
use OC\DB\ConnectionWrapper;
use OC\Files\Node\Root;
use OC\Files\View;
--
GitLab