From c96ed5c4ce27d4ab62cf483193d311fed1c37556 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Mon, 2 May 2016 09:43:17 +0200
Subject: [PATCH] Move OC_Archive to \OC\Archive\Archive

* Move out of legacy folder
* Move to proper namespace
* Fix calling code
---
 lib/private/{legacy/archive.php => Archive/Archive.php} | 7 +++----
 lib/private/Archive/TAR.php                             | 2 +-
 lib/private/Archive/ZIP.php                             | 2 +-
 lib/private/Installer.php                               | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename lib/private/{legacy/archive.php => Archive/Archive.php} (97%)

diff --git a/lib/private/legacy/archive.php b/lib/private/Archive/Archive.php
similarity index 97%
rename from lib/private/legacy/archive.php
rename to lib/private/Archive/Archive.php
index aebc586d72..b5286968a2 100644
--- a/lib/private/legacy/archive.php
+++ b/lib/private/Archive/Archive.php
@@ -28,15 +28,14 @@
  *
  */
 
-use OC\Archive\TAR;
-use OC\Archive\ZIP;
+namespace OC\Archive;
 
-abstract class OC_Archive{
+abstract class Archive{
 	/**
 	 * Open any of the supported archive types
 	 *
 	 * @param string $path
-	 * @return OC_Archive|void
+	 * @return Archive|void
 	 */
 	public static function open($path) {
 		$mime = \OC::$server->getMimeTypeDetector()->detect($path);
diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php
index e233bdeb9c..d783e53d40 100644
--- a/lib/private/Archive/TAR.php
+++ b/lib/private/Archive/TAR.php
@@ -32,7 +32,7 @@
 
 namespace OC\Archive;
 
-class TAR extends \OC_Archive {
+class TAR extends Archive {
 	const PLAIN = 0;
 	const GZIP = 1;
 	const BZIP = 2;
diff --git a/lib/private/Archive/ZIP.php b/lib/private/Archive/ZIP.php
index 1d35e17892..2bc17507d3 100644
--- a/lib/private/Archive/ZIP.php
+++ b/lib/private/Archive/ZIP.php
@@ -29,7 +29,7 @@
 
 namespace OC\Archive;
 
-class ZIP extends \OC_Archive{
+class ZIP extends Archive{
 	/**
 	 * @var \ZipArchive zip
 	 */
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 643590ae22..8ecc92e134 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -300,7 +300,7 @@ class Installer {
 		$extractDir = \OC::$server->getTempManager()->getTemporaryFolder();
 		OC_Helper::rmdirr($extractDir);
 		mkdir($extractDir);
-		if($archive=\OC_Archive::open($path)) {
+		if($archive=\OC\Archive\Archive::open($path)) {
 			$archive->extract($extractDir);
 		} else {
 			OC_Helper::rmdirr($extractDir);