Merge branch 'feature/4155' into develop

Close zendframework/zendframework#4155

src/Helper/Service/IdentityFactory.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\View\Helper\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\View\Helper\Identity;
+
+class IdentityFactory implements FactoryInterface
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @return \Zend\View\Helper\Identity
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $services = $serviceLocator->getServiceLocator();
+        $helper = new Identity();
+        if ($services->has('Zend\Authentication\AuthenticationService')) {
+            $helper->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
+        }
+        return $helper;
+    }
+}

src/HelperPluginManager.php

@@ -28,7 +28,8 @@ class HelperPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $factories = array(
-        'flashmessenger'      => 'Zend\View\Helper\Service\FlashMessengerFactory',
+        'flashmessenger' => 'Zend\View\Helper\Service\FlashMessengerFactory',
+        'identity'       => 'Zend\View\Helper\Service\IdentityFactory',
     );
 
     /**
@@ -92,16 +93,6 @@ public function __construct(ConfigInterface $configuration = null)
     {
         parent::__construct($configuration);
 
-        $this->setFactory('identity', function ($helpers) {
-            $services = $helpers->getServiceLocator();
-            $helper   = new Helper\Identity();
-            if (!$services->has('Zend\Authentication\AuthenticationService')) {
-                return $helper;
-            }
-            $helper->setAuthenticationService($services->get('Zend\Authentication\AuthenticationService'));
-            return $helper;
-        });
-
         $this->addInitializer(array($this, 'injectRenderer'))
              ->addInitializer(array($this, 'injectTranslator'));
     }