From 0cb434686ca05708dc53aba7254e882741de7477 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 2 May 2016 07:23:14 +0200 Subject: Move OC_Archive_XX to PSR-4 * Fix code * Fix tests --- tests/lib/archive/tar.php | 6 ++++-- tests/lib/archive/zip.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/lib/archive') diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index 43157e2054d..2d20bb4c3b1 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +use OC\Archive\TAR; + class Test_Archive_TAR extends Test_Archive { protected function setUp() { parent::setUp(); @@ -17,10 +19,10 @@ class Test_Archive_TAR extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; - return new OC_Archive_TAR($dir . '/data.tar.gz'); + return new TAR($dir . '/data.tar.gz'); } protected function getNew() { - return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz')); + return new TAR(OCP\Files::tmpFile('.tar.gz')); } } diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index 09ea5d7d27c..2f4c9cace1d 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +use OC\Archive\ZIP; + class Test_Archive_ZIP extends Test_Archive { protected function setUp() { parent::setUp(); @@ -17,10 +19,10 @@ class Test_Archive_ZIP extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; - return new OC_Archive_ZIP($dir . '/data.zip'); + return new ZIP($dir . '/data.zip'); } protected function getNew() { - return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); + return new ZIP(OCP\Files::tmpFile('.zip')); } } -- cgit v1.2.3