Merge pull request #38 from martiis/patch-1

Patch 1

Author: Martynas Sudintas

Command/ExportCommand.php

@@ -55,17 +55,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $locales = $input->getOption('locales');
         if (!empty($locales)) {
             $export->setManagedLocales($locales);
-            $locales = implode('</comment><info>, </info><comment>', $locales);
-        } else {
-            $locales = 'all';
         }
 
-        $export->export($input->getOption('domains'));
+        $domains = $input->getOption('domains');
+        $export->export($domains);
+
+        $prettify = function ($array) {
+            return !empty($array) ? implode('</comment><info>`, `</info><comment>', $array) : 'all';
+        };
 
         $output->writeln(
             sprintf(
-                '<info>Successfully exported translations for </info><comment>`%s`</comment><info> locales.</info>',
-                $locales
+                '<info>Successfully exported translations in `</info>'
+                . '<comment>%s</comment><info>` locale(s) for `</info>'
+                . '<comment>%s</comment><info>` domain(s).</info>',
+                $prettify($locales),
+                $prettify($domains)
             )
         );
     }

Controller/ListController.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation;
 use ONGR\ElasticsearchBundle\ORM\Repository;
-use ONGR\FilterManagerBundle\Filters\FilterInterface;
+use ONGR\FilterManagerBundle\Filters\ViewData;
 use ONGR\FilterManagerBundle\Search\SearchResponse;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
@@ -64,7 +64,7 @@ public function listAction(Request $request)
     /**
      * Creates locales list.
      *
-     * @param FilterInterface $filter
+     * @param ViewData\ChoicesAwareViewData $filter
      *
      * @return array
      */
@@ -85,7 +85,7 @@ private function buildLocalesList($filter)
 
         $activeLocales = [];
 
-        if ($filter->getState(null)->isActive()) {
+        if ($filter->getState()->isActive()) {
             foreach ($filter->getChoices() as $choice) {
                 $activeLocales[$choice->getLabel()] = $choice->isActive();
             }

DependencyInjection/ONGRTranslationsExtension.php

@@ -133,9 +133,7 @@ private function setControllerManager($repositoryId, $controllerName, ContainerB
     private function validateBundles($container, $bundles)
     {
         foreach ($bundles as $bundle) {
-            try {
-                $reflection = new \ReflectionClass($bundle);
-            } catch (\ReflectionException $e) {
+            if (!class_exists($bundle)) {
                 throw new InvalidConfigurationException(
                     "Invalid bundle namespace {$bundle}. Error: {$e->getMessage()}"
                 );

Document/Translation.php

@@ -29,14 +29,14 @@ class Translation extends AbstractDocument implements \JsonSerializable
     private $domain;
 
     /**
-     * @var string
+     * @var Tag[]
      * 
      * @ES\Property(name="tags", type="object", multiple=true, objectName="ONGRTranslationsBundle:Tag")
      */
-    private $tags;
+    private $tags = [];
 
     /**
-     * @var Message
+     * @var Message[]
      *
      * @ES\Property(name="messages", type="object", multiple=true, objectName="ONGRTranslationsBundle:Message")
      */

Resources/public/js/directive/InlineDirective.js

@@ -28,7 +28,7 @@ angular
                 /**
                  * @type {string}
                  */
-                scope.value = scope.message.message ? scope.message.message : null;
+                scope.value = scope.message ? scope.message.message : null;
 
                 /**
                  * @type {int}

Storage/StorageInterface.php

@@ -22,7 +22,7 @@ interface StorageInterface
      * @param array $locales
      * @param array $domains
      *
-     * @return array
+     * @return array|\Traversable
      */
     public function read($locales, $domains);