TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FileDownloader test

Browse Source 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
This commit is contained in:
Benjamin Perche
2014-07-03 13:43:59 +02:00
parent ee2c383c73
commit 9d928c1f53
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
View File

@@ -547,7 +547,7 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
*/ */
$initialString = preg_replace("#\/{2,}#", "/", $initialString); $initialString = preg_replace("#\/{2,}#", "/", $initialString);
if (preg_match("#\/?[^\/]+\/[^/]+\/?#", $initialString)) { if (preg_match("#\/?[^\/]+\/[^\/]+\/?#", $initialString)) {
$initialString = "/" . $initialString; $initialString = "/" . $initialString;
} }
return $initialString; return $initialString;

4
core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
View File

@@ -97,6 +97,7 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
public function testAddValidFileFromString() public function testAddValidFileFromString()
{ {
<<<<<<< HEAD
$this->tar->addFileFromString( $this->tar->addFileFromString(
<<<<<<< HEAD <<<<<<< HEAD
"foo", "bar" "foo", "bar"
@@ -306,8 +307,9 @@ class TarArchiveBuilderTest extends \PHPUnit_Framework_TestCase
} }
>>>>>>> Finish implementing and testing zip >>>>>>> Finish implementing and testing zip
======= =======
=======
>>>>>>> Fix FileDownloader test
)
} }
} }
>>>>>>> Complete zip tests >>>>>>> Complete zip tests

4
core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
View File

@@ -15,10 +15,14 @@ use Symfony\Component\DependencyInjection\Container;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Log\Tlog; use Thelia\Log\Tlog;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
use Thelia\Tools\FileDownload\FileDownloader; use Thelia\Tools\FileDownload\FileDownloader;
======= =======
use Thelia\Tools\FileDownloader; use Thelia\Tools\FileDownloader;
>>>>>>> Define archive builders and formatters >>>>>>> Define archive builders and formatters
=======
use Thelia\Tools\FileDownload\FileDownloader;
>>>>>>> Fix FileDownloader test
/** /**
* Class FileDownloaderTest * Class FileDownloaderTest