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/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	modifié:         core/lib/Thelia/Tools/URL.php
This commit is contained in:
Benjamin Perche
2014-07-03 14:20:31 +02:00
parent 9d928c1f53
commit c9b485d3e5
4 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Tools/FileDownload/FileDownloader.php
View File

@@ -18,9 +18,13 @@ use Thelia\Exception\FileNotFoundException;
use Thelia\Exception\HttpUrlException;
use Thelia\Log\Tlog;
<<<<<<< HEAD
<<<<<<< HEAD
use Thelia\Tools\URL;
=======
>>>>>>> Define archive builders and formatters
=======
use Thelia\Tools\URL;
>>>>>>> Fix FileDownloader test
/**
* Class FileDownloader

4
core/lib/Thelia/Tools/URL.php
View File

@@ -315,11 +315,15 @@ class URL
$clean;
}
<<<<<<< HEAD
<<<<<<< HEAD
public static function checkUrl($url, array $protocols = ["http", "https"])
=======
public function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Define archive builders and formatters
=======
public static function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Fix FileDownloader test
{
$pattern = sprintf(UrlValidator::PATTERN, implode('|', $protocols));