lolautruche#32: Removed deprecated ViewParameterProviderInterface

ezecosystem · Jun 12, 2017 · d1bfc62 · d1bfc62
1 parent a4e98ae
commit d1bfc62
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 340 deletions.
diff --git a/EventListener/ViewTemplateListener.php b/EventListener/ViewTemplateListener.php
@@ -37,7 +37,7 @@ class ViewTemplateListener implements EventSubscriberInterface
     private $settingParser;
 
     /**
-     * @var \Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface[]|\Lolautruche\EzCoreExtraBundle\Templating\ViewParameterProviderInterface[]
+     * @var \Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface[]
      */
     private $parameterProviders = [];
 
@@ -54,20 +54,16 @@ public static function getSubscribedEvents()
         ];
     }
 
-    public function addParameterProvider($provider, $alias)
+    public function addParameterProvider(ViewParameterProviderInterface $provider, $alias)
     {
-        if (!($provider instanceof ViewParameterProviderInterface) && !($provider instanceof LegacyParameterProviderInterface)) {
-            throw new \InvalidArgumentException('Parameter provider must implement Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface or Lolautruche\EzCoreExtraBundle\Templating\ViewParameterProviderInterface');
-        }
-
         $this->parameterProviders[$alias] = $provider;
     }
 
     public function onPreContentView(PreContentViewEvent $event)
     {
-        /** @var \eZ\Publish\Core\MVC\Symfony\View\View|\eZ\Publish\Core\MVC\Symfony\View\ContentViewInterface $contentView */
-        $contentView = $event->getContentView();
-        $configHash = $contentView->getConfigHash();
+        /** @var \eZ\Publish\Core\MVC\Symfony\View\View $view */
+        $view = $event->getContentView();
+        $configHash = $view->getConfigHash();
         if (!isset($configHash['params']) || !is_array($configHash['params'])) {
             return;
         }
@@ -98,21 +94,10 @@ public function onPreContentView(PreContentViewEvent $event)
                 // The resulted array is casted to object (stdClass) for convenient use in templates.
                 // Parameter name will be unchanged. Parameters returned by provider will then be "namespaced" by the parameter name.
                 $provider = $this->parameterProviders[$param['provider']];
-                if (!$provider instanceof ViewParameterProviderInterface) {
-                    @trigger_error(
-                        '[ViewParameterProvider] Lolautruche\EzCoreExtraBundle\Templating\ViewParameterProviderInterface is deprecated. Use Lolautruche\EzCoreExtraBundle\View\ViewParameterProviderInterface instead.',
-                        E_USER_DEPRECATED
-                    );
-                    $param = (object) $provider->getParameters([
-                        'template' => $contentView->getTemplateIdentifier(),
-                        'parameters' => $contentView->getParameters(),
-                    ]);
-                } else {
-                    $param = (object) $provider->getViewParameters(new ConfigurableView($contentView), $paramProviderOptions);
-                }
+                $param = (object) $provider->getViewParameters(new ConfigurableView($view), $paramProviderOptions);
             }
         }
 
-        $contentView->setParameters(array_replace($contentView->getParameters(), $configHash['params']));
+        $view->setParameters(array_replace($view->getParameters(), $configHash['params']));
     }
 }
diff --git a/Resources/doc/template_variables_injection.md b/Resources/doc/template_variables_injection.md
@@ -74,9 +74,6 @@ Parameter provider services must implement `\Lolautruche\EzCoreExtraBundle\View\
 (or extend `\Lolautruche\EzCoreExtraBundle\View\ConfigurableViewParameterProvider`).
 Such services must be defined with `ez_core_extra.view_parameter_provider` tag.
 
-> Deprecation notice: `\Lolautruche\EzCoreExtraBundle\Templating\ViewParameterProviderInterface` has been deprecated in v1.1
-> and will be removed in v2.0.
-
 See the [full example below](#example), for details.
 
 

diff --git a/Templating/ViewParameterProviderInterface.php b/Templating/ViewParameterProviderInterface.php
diff --git a/Tests/EventListener/ViewTemplateListenerLegacyProviderTest.php b/Tests/EventListener/ViewTemplateListenerLegacyProviderTest.php
diff --git a/Tests/EventListener/ViewTemplateListenerTest.php b/Tests/EventListener/ViewTemplateListenerTest.php
@@ -12,8 +12,10 @@
 namespace Lolautruche\EzCoreExtraBundle\Tests\EventListener;
 
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\DynamicSettingParser;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\Core\MVC\Symfony\Event\PreContentViewEvent;
 use eZ\Publish\Core\MVC\Symfony\MVCEvents;
+use eZ\Publish\Core\MVC\Symfony\View\View;
 use eZ\Publish\Core\Repository\Values\Content\Content;
 use eZ\Publish\Core\Repository\Values\Content\Location;
 use Lolautruche\EzCoreExtraBundle\EventListener\ViewTemplateListener;
@@ -36,7 +38,7 @@ class ViewTemplateListenerTest extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->configResolver = $this->createMock('\eZ\Publish\Core\MVC\ConfigResolverInterface');
+        $this->configResolver = $this->createMock(ConfigResolverInterface::class);
         $this->dynamicSettingParser = new DynamicSettingParser();
     }
 
@@ -51,18 +53,11 @@ public function testGetSubscribedEvents()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\eZ\Publish\Core\MVC\Symfony\View\View|\eZ\Publish\Core\MVC\Symfony\View\ContentViewInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|\eZ\Publish\Core\MVC\Symfony\View\View
      */
     private function generateView()
     {
-        // \eZ\Publish\Core\MVC\Symfony\View\View is only defined in kernel >=6.0
-        if (interface_exists('\eZ\Publish\Core\MVC\Symfony\View\View')) {
-            $view = $this->createMock('\eZ\Publish\Core\MVC\Symfony\View\View');
-        } else {
-            $view = $this->createMock('\eZ\Publish\Core\MVC\Symfony\View\ContentViewInterface');
-        }
-
-        return $view;
+        return $this->createMock(View::class);
     }
 
     public function testOnPreViewContentNoParams()