Fix cs and add get method in managers

modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.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

core/lib/Thelia/Tools/FileDownload/FileDownloader.php

@@ -52,6 +52,7 @@ class FileDownloader implements FileDownloaderInterface
     }
 
     /**
+<<<<<<< HEAD
 <<<<<<< HEAD
      * @param  string                                  $url
      * @param  string                                  $pathToStore
@@ -59,6 +60,10 @@ class FileDownloader implements FileDownloaderInterface
      * @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
@@ -137,11 +142,15 @@ 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",
                 [
@@ -157,7 +166,11 @@ class FileDownloader implements FileDownloaderInterface
         fclose($file);
     }
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 =======
 } 
 >>>>>>> Define archive builders and formatters
+=======
+}
+>>>>>>> Fix cs and add get method in managers

core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php

@@ -35,11 +35,15 @@ 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)
@@ -49,7 +53,11 @@ trait FileDownloaderAwareTrait
         return $this;
     }
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 =======
 } 
 >>>>>>> Define archive builders and formatters
+=======
+}
+>>>>>>> Fix cs and add get method in managers

core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php

@@ -14,10 +14,13 @@ 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
@@ -26,6 +29,7 @@ use Symfony\Component\Translation\Translator;
 interface FileDownloaderInterface
 {
     /**
+<<<<<<< HEAD
 <<<<<<< HEAD
      * @param  string                                  $url
      * @param  string                                  $pathToStore
@@ -33,6 +37,10 @@ interface FileDownloaderInterface
      * @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
@@ -50,7 +58,11 @@ interface FileDownloaderInterface
      */
     public static function getInstance();
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 =======
 }
 >>>>>>> Define archive builders and formatters
+=======
+}
+>>>>>>> Fix cs and add get method in managers