removed Zend\ServiceManager\Factory\InvokableFactory so ZfcDatagrid…

… works with zend-mvc and zend-servicemanager 2.5
ThaDafinser · Mar 14, 2016 · 49f23d3 · 49f23d3
1 parent af9b6a2
commit 49f23d3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require": {
         "php": "~5.5|~7.0",
 
-        "zendframework/zend-mvc": "~2.7",
+        "zendframework/zend-mvc": "~2.5",
         "zendframework/zend-modulemanager": "~2.5",
         "zendframework/zend-session": "~2.5",
         "zendframework/zend-view": "~2.5",

diff --git a/config/module.config.php b/config/module.config.php
@@ -3,7 +3,6 @@
 use ZfcDatagrid\Datagrid;
 use ZfcDatagrid\Renderer;
 use ZfcDatagrid\Service;
-use Zend\ServiceManager\Factory\InvokableFactory;
 
 return [
     'ZfcDatagrid' => [
@@ -210,17 +209,31 @@
             'zfcDatagrid_dbAdapter' => Service\ZendDbAdapterFactory::class,
 
             // HTML renderer
-            Renderer\BootstrapTable\Renderer::class => InvokableFactory::class,
-            Renderer\JqGrid\Renderer::class => InvokableFactory::class,
+            Renderer\BootstrapTable\Renderer::class => function() {
+                return new Renderer\BootstrapTable\Renderer();
+            },
+            Renderer\JqGrid\Renderer::class => function() {
+                return new Renderer\JqGrid\Renderer();
+            },
 
             // CLI renderer
-            Renderer\ZendTable\Renderer::class => InvokableFactory::class,
+            Renderer\ZendTable\Renderer::class => function() {
+                return new Renderer\ZendTable\Renderer();
+            },
 
             // Export renderer
-            Renderer\PrintHtml\Renderer::class => InvokableFactory::class,
-            Renderer\PHPExcel\Renderer::class => InvokableFactory::class,
-            Renderer\TCPDF\Renderer::class => InvokableFactory::class,
-            Renderer\Csv\Renderer::class => InvokableFactory::class,
+            Renderer\PrintHtml\Renderer::class => function() {
+                return new Renderer\PrintHtml\Renderer();
+            },
+            Renderer\PHPExcel\Renderer::class => function() {
+                return new Renderer\PHPExcel\Renderer();
+            },
+            Renderer\TCPDF\Renderer::class => function() {
+                return new Renderer\TCPDF\Renderer();
+            },
+            Renderer\Csv\Renderer::class => function() {
+                return new Renderer\Csv\Renderer();
+            },
         ],
 
         'aliases' => [