From a80a35b5de7c1ee901434c015b96b088fae2993a Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Fri, 4 Jul 2014 15:07:07 +0200 Subject: [PATCH] =?UTF-8?q?Add=20getNames=20methods=20to=20managers=20=09m?= =?UTF-8?q?odifi=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Core/Fil?= =?UTF-8?q?eFormat/Archive/ArchiveBuilderManager.php=20=09modifi=C3=A9:=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20core/lib/Thelia/Core/FileFormat/Formatt?= =?UTF-8?q?er/FormatterManager.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Archive/ArchiveBuilderManager.php | 36 +++++++++++++++++-- .../FileFormat/Formatter/FormatterManager.php | 15 ++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php index 7c040f1a5..0b9e111c5 100644 --- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php +++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php @@ -22,6 +22,9 @@ class ArchiveBuilderManager { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Add getNames methods to managers /** @var array */ protected $archiveBuilders = array(); ======= @@ -39,6 +42,7 @@ class ArchiveBuilderManager } /** <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * @param AbstractArchiveBuilder $archiveBuilder * @return $this @@ -54,19 +58,26 @@ class ArchiveBuilderManager ======= * @param AbstractArchiveBuilder $archiveCreator >>>>>>> Fix cs +======= + * @param AbstractArchiveBuilder $archiveBuilder +>>>>>>> Add getNames methods to managers * @return $this */ - public function add(AbstractArchiveBuilder $archiveCreator) + public function add(AbstractArchiveBuilder $archiveBuilder) { - if (null !== $archiveCreator) { - $archiveCreator->setEnvironment($this->environment); + if (null !== $archiveBuilder) { + $archiveBuilder->setEnvironment($this->environment); +<<<<<<< HEAD <<<<<<< HEAD $this->archiveCreators[$archiveCreator->getName()] = $archiveCreator; >>>>>>> Define archive builders and formatters ======= $this->archiveBuilders[$archiveCreator->getName()] = $archiveCreator; >>>>>>> Fix cs and add get method in managers +======= + $this->archiveBuilders[$archiveBuilder->getName()] = $archiveBuilder; +>>>>>>> Add getNames methods to managers } return $this; @@ -112,6 +123,7 @@ class ArchiveBuilderManager } /** +<<<<<<< HEAD <<<<<<< HEAD * @return array */ @@ -158,12 +170,30 @@ class ArchiveBuilderManager } ======= * @return array[AbstractArchiveBuilder] +======= + * @return array +>>>>>>> Add getNames methods to managers */ public function getAll() { return $this->archiveBuilders; } + /** + * @return array + */ + public function getNames() + { + $names = []; + + /** @var AbstractArchiveBuilder $builder */ + foreach($this->archiveBuilders as $builder) { + $names[] = $builder->getName(); + } + + return $names; + } + public function get($name) { if (!array_key_exists($name, $this->archiveBuilders)) { diff --git a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php index 4035927ae..b7801c7a9 100644 --- a/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php +++ b/core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php @@ -69,6 +69,21 @@ class FormatterManager return $this->formatters; } + /** + * @return array + */ + public function getNames() + { + $names = []; + + /** @var AbstractFormatter $formatter */ + foreach($this->formatters as $formatter) { + $names[] = $formatter->getName(); + } + + return $names; + } + /** * @param $name * @throws \OutOfBoundsException