Merge pull request #234 from kokspflanze/bugfix/view_helper

view helper AbstractPluginManager
ThaDafinser · Apr 13, 2016 · 58eee24 · 58eee24
2 parents ba02f46 + 41a2610
commit 58eee24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php b/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php
@@ -1,21 +1,22 @@
 <?php
 namespace ZfcDatagrid\Renderer\BootstrapTable\View\Helper;
 
+use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 class TableRowFactory implements FactoryInterface
 {
     /**
-     * @param  ServiceLocatorInterface $serviceLocator
+     * @param  ServiceLocatorInterface|AbstractPluginManager $serviceLocator
      * @return TableRow
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $tableRow = new TableRow();
-        if ($serviceLocator->has('translator')) {
+        if ($serviceLocator->getServiceLocator()->has('translator')) {
             /** @noinspection PhpParamsInspection */
-            $tableRow->setTranslator($serviceLocator->get('translator'));
+            $tableRow->setTranslator($serviceLocator->getServiceLocator()->get('translator'));
         }
 
         return $tableRow;

diff --git a/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php b/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php
@@ -1,21 +1,22 @@
 <?php
 namespace ZfcDatagrid\Renderer\JqGrid\View\Helper;
 
+use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 class ColumnsFactory implements FactoryInterface
 {
     /**
-     * @param  ServiceLocatorInterface $serviceLocator
+     * @param  ServiceLocatorInterface|AbstractPluginManager $serviceLocator
      * @return Columns
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $tableRow = new Columns();
-        if ($serviceLocator->has('translator')) {
+        if ($serviceLocator->getServiceLocator()->has('translator')) {
             /** @noinspection PhpParamsInspection */
-            $tableRow->setTranslator($serviceLocator->get('translator'));
+            $tableRow->setTranslator($serviceLocator->getServiceLocator()->get('translator'));
         }
 
         return $tableRow;