From 482bca1713ba139c7b3f71a7cc7194d358a6392c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 11 Aug 2014 14:20:57 +0200 Subject: [PATCH] Fix Tar support for php >=5.5 --- 3rdparty | 2 +- tests/lib/archive/tar.php | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/3rdparty b/3rdparty index 3f2b62ec13..57245d2a64 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 3f2b62ec137082cc435bd358f9632139c1039b08 +Subproject commit 57245d2a64c99aab8a438f909988e7a4ffef5b23 diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index d831487b16..e66a874087 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -10,12 +10,6 @@ require_once 'archive.php'; if (!OC_Util::runningOnWindows()) { class Test_Archive_TAR extends Test_Archive { - public function setUp() { - if (floatval(phpversion())>=5.5) { - $this->markTestSkipped('php 5.5 changed unpack function.'); - return; - } - } protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; return new OC_Archive_TAR($dir . '/data.tar.gz');