Revert files

modifié: core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php supprimé: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php~HEAD modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php modifié: core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php modifié: core/lib/Thelia/Core/FileFormat/FormatInterface.php modifié: core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php modifié: core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php modifié: core/lib/Thelia/Tests/Action/FolderTest.php modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.tar modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php modifié: core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php modifié: core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php modifié: core/lib/Thelia/Tests/Tools/FakeFileDownloader.php modifié: core/lib/Thelia/Tests/Tools/FileDownloaderTest.php modifié: core/lib/Thelia/Tools/FileDownload/FileDownloader.php modifié: core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php modifié: core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
2014-07-10 14:04:26 +02:00
parent fa7b02c9c9
commit 45bb5a7bfb
27 changed files with 412 additions and 2211 deletions
--- a/core/lib/Thelia/Tools/FileDownload/FileDownloader.php
+++ b/core/lib/Thelia/Tools/FileDownload/FileDownloader.php
@@ -17,14 +17,7 @@ use Thelia\Core\Translation\Translator as TheliaTranslator;
 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
@@ -52,18 +45,8 @@ class FileDownloader implements FileDownloaderInterface
    }

    /**
-<<<<<<< HEAD
-<<<<<<< HEAD
     * @param  string                                  $url
     * @param  string                                  $pathToStore
-=======
-     * @param string $url
-     * @param string $pathToStore
->>>>>>> Define archive builders and formatters
-=======
-     * @param  string                                  $url
-     * @param  string                                  $pathToStore
->>>>>>> Fix cs and add get method in managers
     * @throws \Thelia\Exception\FileNotFoundException
     * @throws \ErrorException
     * @throws \HttpUrlException
@@ -142,15 +125,7 @@ class FileDownloader implements FileDownloaderInterface
         */
        $file = @fopen($pathToStore, "w");

-<<<<<<< HEAD
-<<<<<<< HEAD
        if ($file === false) {
-=======
-        if($file === false) {
->>>>>>> Define archive builders and formatters
-=======
-        if ($file === false) {
->>>>>>> Fix cs and add get method in managers
            $translatedErrorMessage = $this->translator->trans(
                "Failed to open a writing stream on the file: %file",
                [
@@ -165,12 +140,4 @@ class FileDownloader implements FileDownloaderInterface
        fputs($file, $response);
        fclose($file);
    }
-<<<<<<< HEAD
-<<<<<<< HEAD
 }
-=======
-} 
->>>>>>> Define archive builders and formatters
-=======
-}
->>>>>>> Fix cs and add get method in managers
--- a/core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
+++ b/core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
@@ -35,15 +35,7 @@ trait FileDownloaderAwareTrait
    }

    /**
-<<<<<<< HEAD
-<<<<<<< HEAD
     * @param  FileDownloaderInterface $fileDownloader
-=======
-     * @param FileDownloaderInterface $fileDownloader
->>>>>>> Define archive builders and formatters
-=======
-     * @param  FileDownloaderInterface $fileDownloader
->>>>>>> Fix cs and add get method in managers
     * @return $this
     */
    public function setFileDownloader(FileDownloaderInterface $fileDownloader)
@@ -52,12 +44,4 @@ trait FileDownloaderAwareTrait

        return $this;
    }
-<<<<<<< HEAD
-<<<<<<< HEAD
 }
-=======
-} 
->>>>>>> Define archive builders and formatters
-=======
-}
->>>>>>> Fix cs and add get method in managers
--- a/core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
+++ b/core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
@@ -14,13 +14,6 @@ namespace Thelia\Tools\FileDownload;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Translation\Translator;

-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> Define archive builders and formatters
-=======
->>>>>>> Fix cs and add get method in managers
 /**
 * Class FileDownloader
 * @package Thelia\Tools\FileDownload
@@ -29,18 +22,8 @@ use Symfony\Component\Translation\Translator;
 interface FileDownloaderInterface
 {
    /**
-<<<<<<< HEAD
-<<<<<<< HEAD
     * @param  string                                  $url
     * @param  string                                  $pathToStore
-=======
-     * @param string $url
-     * @param string $pathToStore
->>>>>>> Define archive builders and formatters
-=======
-     * @param  string                                  $url
-     * @param  string                                  $pathToStore
->>>>>>> Fix cs and add get method in managers
     * @throws \Thelia\Exception\FileNotFoundException
     * @throws \ErrorException
     * @throws \HttpUrlException
@@ -57,12 +40,4 @@ interface FileDownloaderInterface
     * Returns an hydrated instance
     */
    public static function getInstance();
-<<<<<<< HEAD
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> Define archive builders and formatters
-=======
-}
->>>>>>> Fix cs and add get method in managers