Lift non-interop container restriction

Author: Xerkus

src/ZendViewRendererFactory.php

@@ -9,15 +9,13 @@
 
 namespace Zend\Expressive\ZendView;
 
-use Interop\Container\ContainerInterface as InteropContainerInterface;
 use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\ServerUrlHelper as BaseServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper as BaseUrlHelper;
 use Zend\View\HelperPluginManager;
 use Zend\View\Renderer\PhpRenderer;
 use Zend\View\Resolver;
 
-use function get_class;
 use function is_array;
 use function is_numeric;
 use function sprintf;
@@ -136,28 +134,12 @@ private function injectHelpers(PhpRenderer $renderer, ContainerInterface $contai
         $renderer->setHelperPluginManager($helpers);
     }
 
-    /**
-     * @throws Exception\InvalidContainerException if the $container argument
-     *     does not implement InteropContainerInterface.
-     */
     private function retrieveHelperManager(ContainerInterface $container) : HelperPluginManager
     {
         if ($container->has(HelperPluginManager::class)) {
             return $container->get(HelperPluginManager::class);
         }
 
-        if (! $container instanceof InteropContainerInterface) {
-            throw new Exception\InvalidContainerException(sprintf(
-                '%s expects a %s instance to its constructor; however, your service'
-                . ' container is an instance of %s, which does not implement that'
-                . ' interface. Consider switching to zend-servicemanager for your'
-                . ' container implementation if you wish to use the zend-view renderer.',
-                HelperPluginManager::class,
-                InteropContainerInterface::class,
-                get_class($container)
-            ));
-        }
-
         return new HelperPluginManager($container);
     }
 }

test/ZendViewRendererFactoryTest.php

@@ -9,15 +9,13 @@
 
 namespace ZendTest\Expressive\ZendView;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophecy\ProphecyInterface;
-use Psr\Container\ContainerInterface as PsrContainerInterface;
 use ReflectionProperty;
 use Zend\Expressive\Helper;
 use Zend\Expressive\Template\TemplatePath;
-use Zend\Expressive\ZendView\Exception\InvalidContainerException;
 use Zend\Expressive\ZendView\ServerUrlHelper;
 use Zend\Expressive\ZendView\UrlHelper;
 use Zend\Expressive\ZendView\ZendViewRenderer;
@@ -371,19 +369,4 @@ public function testWillUseRendererFromContainer()
         $composed = $this->fetchPhpRenderer($view);
         $this->assertSame($engine, $composed);
     }
-
-    public function testWillRaiseExceptionIfContainerDoesNotImplementInteropContainerInterface()
-    {
-        $container = $this->prophesize(PsrContainerInterface::class);
-        $container->has('config')->willReturn(false);
-        $container->get('config')->shouldNotBeCalled();
-        $container->has(PhpRenderer::class)->willReturn(false);
-        $container->get(PhpRenderer::class)->shouldNotBeCalled();
-        $container->has(HelperPluginManager::class)->willReturn(false);
-
-        $factory = new ZendViewRendererFactory();
-
-        $this->expectException(InvalidContainerException::class);
-        $factory($container->reveal());
-    }
 }