Merge branch 'feature/12' into develop

Close #12
zendframework · Oct 29, 2015 · 758570a · 758570a
2 parents e45d2fd + e852e3b
commit 758570a
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 3.0.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#12](https://github.com/zendframework/zend-i18n/pull/12) updates the
+  component to the v3 version of zend-servicemanager.
+- [#12](https://github.com/zendframework/zend-i18n/pull/12) updates the
+  component to the v3 version of zend-eventmanager.
diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
         "zendframework/zend-stdlib": "~2.5"
     },
     "require-dev": {
-        "zendframework/zend-cache": "~2.5",
+        "zendframework/zend-cache": "dev-develop as 2.6.0",
         "zendframework/zend-config": "~2.5",
-        "zendframework/zend-eventmanager": "~2.5",
+        "zendframework/zend-eventmanager": "dev-develop as 2.7.0",
         "zendframework/zend-filter": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
+        "zendframework/zend-servicemanager": "dev-develop as 2.7.0",
         "zendframework/zend-validator": "~2.5",
-        "zendframework/zend-view": "~2.5",
+        "zendframework/zend-view": "dev-develop as 2.6.0",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
@@ -43,7 +43,7 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.php
@@ -11,6 +11,7 @@
 
 use Zend\I18n\Exception;
 use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\Factory\InvokableFactory;
 
 /**
  * Plugin manager implementation for translation loaders.
@@ -54,15 +55,16 @@
  */
 class LoaderPluginManager extends AbstractPluginManager
 {
-    /**
-     * Default set of loaders.
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'gettext'  => 'Zend\I18n\Translator\Loader\Gettext',
-        'ini'      => 'Zend\I18n\Translator\Loader\Ini',
-        'phparray' => 'Zend\I18n\Translator\Loader\PhpArray',
+    protected $aliases = [
+        'gettext'  => Loader\Gettext::class,
+        'ini'      => Loader\Ini::class,
+        'phparray' => Loader\PhpArray::class
+    ];
+
+    protected $factories = [
+        Loader\Gettext::class  => InvokableFactory::class,
+        Loader\Ini::class      => InvokableFactory::class,
+        Loader\PhpArray::class => InvokableFactory::class
     ];
 
     /**

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -19,6 +19,7 @@
 use Zend\I18n\Translator\Loader\FileLoaderInterface;
 use Zend\I18n\Translator\Loader\RemoteLoaderInterface;
 use Zend\Stdlib\ArrayUtils;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * Translator.
@@ -334,7 +335,7 @@ public function setPluginManager(LoaderPluginManager $pluginManager)
     public function getPluginManager()
     {
         if (!$this->pluginManager instanceof LoaderPluginManager) {
-            $this->setPluginManager(new LoaderPluginManager());
+            $this->setPluginManager(new LoaderPluginManager(new ServiceManager));
         }
 
         return $this->pluginManager;
@@ -445,17 +446,18 @@ protected function getTranslatedMessage(
         }
 
         if ($this->isEventManagerEnabled()) {
-            $results = $this->getEventManager()->trigger(
+            $until = function ($r) {
+                return is_string($r);
+            };
+            $results = $this->getEventManager()->triggerUntil(
+                $until,
                 self::EVENT_MISSING_TRANSLATION,
                 $this,
                 [
                     'message'     => $message,
                     'locale'      => $locale,
                     'text_domain' => $textDomain,
-                ],
-                function ($r) {
-                    return is_string($r);
-                }
+                ]
             );
             $last = $results->last();
             if (is_string($last)) {
@@ -574,16 +576,17 @@ protected function loadMessages($textDomain, $locale)
         if (!$messagesLoaded) {
             $discoveredTextDomain = null;
             if ($this->isEventManagerEnabled()) {
-                $results = $this->getEventManager()->trigger(
+                $until = function ($r) {
+                    return ($r instanceof TextDomain);
+                };
+                $results = $this->getEventManager()->triggerUntil(
+                    $until,
                     self::EVENT_NO_MESSAGES_LOADED,
                     $this,
                     [
                         'locale'      => $locale,
                         'text_domain' => $textDomain,
-                    ],
-                    function ($r) {
-                        return ($r instanceof TextDomain);
-                    }
+                    ]
                 );
                 $last = $results->last();
                 if ($last instanceof TextDomain) {

diff --git a/src/Translator/TranslatorServiceFactory.php b/src/Translator/TranslatorServiceFactory.php
@@ -9,14 +9,15 @@
 
 namespace Zend\I18n\Translator;
 
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
+use Interop\Container\ContainerInterface;
 
 /**
  * Translator.
  */
 class TranslatorServiceFactory implements FactoryInterface
 {
+    /*
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         // Configure the translator
@@ -25,4 +26,14 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         $translator = Translator::factory($trConfig);
         return $translator;
     }
+    */
+
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        // Configure the translator
+        $config = $container->get('Config');
+        $trConfig = isset($config['translator']) ? $config['translator'] : [];
+        $translator = Translator::factory($trConfig);
+        return $translator;
+    }
 }
diff --git a/src/View/HelperConfig.php b/src/View/HelperConfig.php
@@ -36,12 +36,12 @@ class HelperConfig implements ConfigInterface
      * in this class.
      *
      * @param  ServiceManager $serviceManager
-     * @return void
+     * @return ServiceManager
      */
     public function configureServiceManager(ServiceManager $serviceManager)
     {
-        foreach ($this->invokables as $name => $service) {
-            $serviceManager->setInvokableClass($name, $service);
-        }
+        return $serviceManager->withConfig(
+            [ 'invokables' => $this->invokables ]
+        );
     }
 }
diff --git a/test/Translator/TranslatorServiceFactoryTest.php b/test/Translator/TranslatorServiceFactoryTest.php
@@ -23,7 +23,7 @@ public function testCreateServiceWithNoTranslatorKeyDefined()
                        ->will($this->returnValueMap($slContents));
 
         $factory = new TranslatorServiceFactory();
-        $translator = $factory->createService($serviceLocator);
+        $translator = $factory($serviceLocator, 'Zend\I18n\Translator\Translator');
         $this->assertInstanceOf('Zend\I18n\Translator\Translator', $translator);
     }
 }
diff --git a/test/Translator/TranslatorTest.php b/test/Translator/TranslatorTest.php
@@ -165,7 +165,14 @@ public function testTranslate()
     {
         $loader = new TestLoader();
         $loader->textDomain = new TextDomain(['foo' => 'bar']);
-        $this->translator->getPluginManager()->setService('test', $loader);
+        $pm = $this->translator->getPluginManager();
+        $this->translator->setPluginManager(
+            $pm->withConfig([
+                'services' => [
+                    'test' => $loader
+                ]
+            ])
+        );
         $this->translator->addTranslationFile('test', null);
 
         $this->assertEquals('bar', $this->translator->translate('foo'));
@@ -191,7 +198,8 @@ public function testTranslationsAreStoredInCache()
 
         $loader = new TestLoader();
         $loader->textDomain = new TextDomain(['foo' => 'bar']);
-        $this->translator->getPluginManager()->setService('test', $loader);
+        $plugins = $this->translator->getPluginManager()->withConfig(['services' => ['test' => $loader]]);
+        $this->translator->setPluginManager($plugins);
         $this->translator->addTranslationFile('test', null);
 
         $this->assertEquals('bar', $this->translator->translate('foo'));
@@ -317,13 +325,14 @@ public function testListenerOnMissingTranslationEventCanReturnString()
         $doNotTriger = null;
 
         $this->translator->enableEventManager();
-        $this->translator->getEventManager()->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) use (&$trigger) {
+        $events = $this->translator->getEventManager();
+        $events->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) use (&$trigger) {
             $trigger = true;
         });
-        $this->translator->getEventManager()->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) {
+        $events->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) {
             return 'EVENT TRIGGERED';
         });
-        $this->translator->getEventManager()->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) use (&$doNotTrigger) {
+        $events->attach(Translator::EVENT_MISSING_TRANSLATION, function (EventInterface $event) use (&$doNotTrigger) {
             $doNotTrigger = true;
         });
 
@@ -338,9 +347,11 @@ public function testNoMessagesLoadedEvent()
         $actualEvent = null;
 
         $this->translator->enableEventManager();
-        $this->translator->getEventManager()->attach(Translator::EVENT_NO_MESSAGES_LOADED, function (EventInterface $event) use (&$actualEvent) {
-            $actualEvent = $event;
-        });
+        $this->translator
+            ->getEventManager()
+            ->attach(Translator::EVENT_NO_MESSAGES_LOADED, function (EventInterface $event) use (&$actualEvent) {
+                $actualEvent = $event;
+            });
 
         $this->translator->translate('foo', 'bar', 'baz');