wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move OC_Archive to \OC\Archive\Archive

Browse source 
* Move out of legacy folder
* Move to proper namespace
* Fix calling code
This commit is contained in:
Roeland Jago Douma 2016-05-02 09:43:17 +02:00
parent 0cb434686c
commit c96ed5c4ce
No known key found for this signature in database
GPG key ID: 1E152838F164D13B
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/legacy/archive.php → lib/private/Archive/Archive.php
View file

@ -28,15 +28,14 @@
* *
*/ */
use OC\Archive\TAR; namespace OC\Archive;
use OC\Archive\ZIP;
abstract class OC_Archive{ abstract class Archive{
/** /**
* Open any of the supported archive types * Open any of the supported archive types
* *
* @param string $path * @param string $path
* @return OC_Archive|void * @return Archive|void
*/ */
public static function open($path) { public static function open($path) {
$mime = \OC::$server->getMimeTypeDetector()->detect($path); $mime = \OC::$server->getMimeTypeDetector()->detect($path);

2
lib/private/Archive/TAR.php
View file

@ -32,7 +32,7 @@
namespace OC\Archive; namespace OC\Archive;
class TAR extends \OC_Archive { class TAR extends Archive {
const PLAIN = 0; const PLAIN = 0;
const GZIP = 1; const GZIP = 1;
const BZIP = 2; const BZIP = 2;

2
lib/private/Archive/ZIP.php
View file

@ -29,7 +29,7 @@
namespace OC\Archive; namespace OC\Archive;
class ZIP extends \OC_Archive{ class ZIP extends Archive{
/** /**
* @var \ZipArchive zip * @var \ZipArchive zip
*/ */

2
lib/private/Installer.php
View file

@ -300,7 +300,7 @@ class Installer {
$extractDir = \OC::$server->getTempManager()->getTemporaryFolder(); $extractDir = \OC::$server->getTempManager()->getTemporaryFolder();
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);
mkdir($extractDir); mkdir($extractDir);
if($archive=\OC_Archive::open($path)) { if($archive=\OC\Archive\Archive::open($path)) {
$archive->extract($extractDir); $archive->extract($extractDir);
} else { } else {
OC_Helper::rmdirr($extractDir); OC_Helper::rmdirr($extractDir);