From c2720c9f2f75680661662557c1454f8999692429 Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Fri, 4 Jul 2014 13:44:28 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20cs=20and=20add=20get=20method=20in=20mana?= =?UTF-8?q?gers=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thel?= =?UTF-8?q?ia/Core/FileFormat/Archive/ArchiveBuilderManager.php=20=09modif?= =?UTF-8?q?i=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Core/FileFor?= =?UTF-8?q?mat/Formatter/FormatterData.php=20=09modifi=C3=A9:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20core/lib/Thelia/Core/FileFormat/Formatter/Format?= =?UTF-8?q?terManager.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20cor?= =?UTF-8?q?e/lib/Thelia/Tools/FileDownload/FileDownloader.php=20=09modifi?= =?UTF-8?q?=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Tools/FileDow?= =?UTF-8?q?nload/FileDownloaderAwareTrait.php=20=09modifi=C3=A9:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20core/lib/Thelia/Tools/FileDownload/FileDownlo?= =?UTF-8?q?aderInterface.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Archive/ArchiveBuilderManager.php | 39 ++++++++++++++++++- .../FileFormat/Formatter/FormatterData.php | 25 ++++++++++++ .../FileFormat/Formatter/FormatterManager.php | 34 ++++++++++++---- .../Tools/FileDownload/FileDownloader.php | 13 +++++++ .../FileDownload/FileDownloaderAwareTrait.php | 8 ++++ .../FileDownload/FileDownloaderInterface.php | 12 ++++++ 6 files changed, 122 insertions(+), 9 deletions(-) diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php index e8a13a20e..7c040f1a5 100644 --- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php +++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php @@ -20,12 +20,16 @@ use Thelia\Core\Translation\Translator; */ class ArchiveBuilderManager { +<<<<<<< HEAD <<<<<<< HEAD /** @var array */ protected $archiveBuilders = array(); ======= protected $archiveCreators = array(); >>>>>>> Define archive builders and formatters +======= + protected $archiveBuilders = array(); +>>>>>>> Fix cs and add get method in managers protected $environment; @@ -57,8 +61,12 @@ class ArchiveBuilderManager if (null !== $archiveCreator) { $archiveCreator->setEnvironment($this->environment); +<<<<<<< HEAD $this->archiveCreators[$archiveCreator->getName()] = $archiveCreator; >>>>>>> Define archive builders and formatters +======= + $this->archiveBuilders[$archiveCreator->getName()] = $archiveCreator; +>>>>>>> Fix cs and add get method in managers } return $this; @@ -71,6 +79,7 @@ class ArchiveBuilderManager */ public function delete($name) { +<<<<<<< HEAD <<<<<<< HEAD if (!array_key_exists($name, $this->archiveBuilders)) { $this->throwOutOfBounds($name); @@ -91,6 +100,13 @@ class ArchiveBuilderManager unset($this->archiveCreators[$name]); >>>>>>> Define archive builders and formatters +======= + if (!array_key_exists($name, $this->archiveBuilders)) { + $this->throwOutOfBounds($name); + } + + unset($this->archiveBuilders[$name]); +>>>>>>> Fix cs and add get method in managers return $this; } @@ -145,7 +161,28 @@ class ArchiveBuilderManager */ public function getAll() { - return $this->archiveCreators; + return $this->archiveBuilders; + } + + public function get($name) + { + if (!array_key_exists($name, $this->archiveBuilders)) { + $this->throwOutOfBounds($name); + } + + return $this->archiveBuilders[$name]; + } + + protected function throwOutOfBounds($name) + { + throw new \OutOfBoundsException( + Translator::getInstance()->trans( + "The archive creator %name doesn't exist", + [ + "%name" => $name + ] + ) + ); } <<<<<<< HEAD } diff --git a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php index 689ad0ba6..a74ecef90 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php +++ b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php @@ -11,6 +11,8 @@ /*************************************************************************************/ namespace Thelia\Core\FileFormat\Formatter; +use Propel\Runtime\ActiveQuery\ModelCriteria; +use Thelia\Core\Translation\Translator; /** * Class FormatterData @@ -19,5 +21,28 @@ namespace Thelia\Core\FileFormat\Formatter; */ class FormatterData { + /** @var array */ + protected $data; + /** @var Translator */ + protected $translator; + + public function __construct() + { + $this->translator = Translator::getInstance(); + } + + public function loadModelCriteria(ModelCriteria $criteria) + { + + $propelData = + $criteria + ->find() + ; + + if (empty($propelData)) { + return null; + } + + } } diff --git a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php index b8e5d5d66..4035927ae 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php +++ b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php @@ -44,14 +44,7 @@ class FormatterManager public function delete($name) { if (!array_key_exists($name, $this->formatters)) { - throw new \OutOfBoundsException( - Translator::getInstance()->trans( - "The formatter %name doesn't exist", - [ - "%name" => $name - ] - ) - ); + $this->throwOutOfBounds($name); } unset($this->formatters[$name]); @@ -59,6 +52,15 @@ class FormatterManager return $this; } + public function get($name) + { + if (!array_key_exists($name, $this->formatters)) { + $this->throwOutOfBounds($name); + } + + return $this->formatters[$name]; + } + /** * @return array[AbstractFormatter] */ @@ -66,4 +68,20 @@ class FormatterManager { return $this->formatters; } + + /** + * @param $name + * @throws \OutOfBoundsException + */ + protected function throwOutOfBounds($name) + { + throw new \OutOfBoundsException( + Translator::getInstance()->trans( + "The formatter %name doesn't exist", + [ + "%name" => $name + ] + ) + ); + } } diff --git a/core/lib/Thelia/Tools/FileDownload/FileDownloader.php b/core/lib/Thelia/Tools/FileDownload/FileDownloader.php index ac0ae7eca..95c54465d 100644 --- a/core/lib/Thelia/Tools/FileDownload/FileDownloader.php +++ b/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 diff --git a/core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php b/core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php index d0472b41d..5ef7880e5 100644 --- a/core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php +++ b/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 diff --git a/core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php b/core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php index 0f451396b..b9f1eaab3 100644 --- a/core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php +++ b/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