Merge branch 'feature/60' into develop

Close #60

Author: weierophinney

CHANGELOG.md

@@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file, in reverse
   method to the `partialLoop()` helper, allowing the ability to chain setters
   with rendering:
   `$this->partialLoop()->setObjectKey('foo')->loop('partial', $data)`
+- [#60](https://github.com/zendframework/zend-view/pull/60) adds the ability to
+  register and consume arbitrary callables as view helpers within the
+  `HelperPluginManager`.
 
 ### Deprecated
 

src/HelperPluginManager.php

@@ -137,8 +137,6 @@ class HelperPluginManager extends AbstractPluginManager
         'ViewModel'           => Helper\ViewModel::class,
     ];
 
-    protected $instanceOf = Helper\HelperInterface::class;
-
     /**
      * Default factories
      *
@@ -289,6 +287,10 @@ public function injectRenderer($first, $second)
             ? $second
             : $first;
 
+        if (! $helper instanceof Helper\HelperInterface) {
+            return;
+        }
+
         $renderer = $this->getRenderer();
         if (null === $renderer) {
             return;
@@ -393,19 +395,19 @@ public function injectEventManager($first, $second)
     /**
      * Validate the plugin is of the expected type (v3).
      *
-     * Validates against `$instanceOf`.
+     * Validates against callables and HelperInterface implementations.
      *
      * @param mixed $instance
      * @throws InvalidServiceException
      */
     public function validate($instance)
     {
-        if (!$instance instanceof $this->instanceOf) {
+        if (! is_callable($instance) && ! $instance instanceof Helper\HelperInterface) {
             throw new InvalidServiceException(
                 sprintf(
-                    '%s can only create instances of %s; %s is invalid',
+                    '%s can only create instances of %s and/or callables; %s is invalid',
                     get_class($this),
-                    $this->instanceOf,
+                    Helper\HelperInterface::class,
                     (is_object($instance) ? get_class($instance) : gettype($instance))
                 )
             );

test/HelperPluginManagerCompatibilityTest.php

@@ -11,14 +11,13 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;
-use Zend\Mvc\Controller\PluginManager as ControllerPluginManager;
 use Zend\Mvc\Controller\Plugin\FlashMessenger;
+use Zend\Mvc\Controller\PluginManager as ControllerPluginManager;
 use Zend\ServiceManager\Config;
-use Zend\View\Exception\InvalidHelperException;
-use Zend\View\Helper\HelperInterface;
-use Zend\View\HelperPluginManager;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Test\CommonPluginManagerTrait;
+use Zend\View\Exception\InvalidHelperException;
+use Zend\View\HelperPluginManager;
 
 class HelperPluginManagerCompatibilityTest extends TestCase
 {
@@ -56,11 +55,6 @@ protected function getV2InvalidPluginException()
         return InvalidHelperException::class;
     }
 
-    protected function getInstanceOf()
-    {
-        return HelperInterface::class;
-    }
-
     public function aliasProvider()
     {
         $pluginManager = $this->getPluginManager();
@@ -82,4 +76,14 @@ public function aliasProvider()
             yield $alias => [$alias, $target];
         }
     }
+
+    public function getInstanceOf()
+    {
+        // no-op; instanceof is not used in this implementation
+    }
+
+    public function testInstanceOfMatches()
+    {
+        $this->markTestSkipped('instanceOf is not used with this implementation');
+    }
 }

test/HelperPluginManagerTest.php

@@ -194,6 +194,23 @@ public function testCanOverrideAFactoryViaConfigurationPassedToConstructor()
         $this->assertSame($helper, $helpers->get('url'));
     }
 
+    public function testCanUseCallableAsHelper()
+    {
+        $helper = function () {};
+        $helpers = new HelperPluginManager(new ServiceManager());
+        $config = new Config(
+            [
+                'factories' => [
+                    'foo' => function ($container) use ($helper) {
+                        return $helper;
+                    },
+                ]
+            ]
+        );
+        $config->configureServiceManager($helpers);
+        $this->assertSame($helper, $helpers->get('foo'));
+    }
+
     private function getServiceNotFoundException(HelperPluginManager $manager)
     {
         if (method_exists($manager, 'configure')) {