mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10333 from owncloud/tar-55 

Fix Tar support for php >=5.5
This commit is contained in:
Thomas Müller 2014-08-13 11:10:18 +02:00
parent 609a52ebe2 482bca1713
commit fc46fbd154
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 3f2b62ec137082cc435bd358f9632139c1039b08
Subproject commit 57245d2a64c99aab8a438f909988e7a4ffef5b23

6
tests/lib/archive/tar.php
View File

@ -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');