removed invokable from controllers

config/module.config.php

@@ -1,5 +1,6 @@
 <?php
 
+use ZfcTicketSystem\Controller;
 use ZfcTicketSystem\Service;
 
 return [
@@ -42,7 +43,7 @@
             'zfcticketsystem_category_service' => Service\Category::class,
         ],
         'factories' => [
-            Service\TicketSystem::class => function($sm) {
+            Service\TicketSystem::class => function ($sm) {
                 /** @var $sm \Zend\ServiceManager\ServiceLocatorInterface */
                 /** @noinspection PhpParamsInspection */
                 return new Service\TicketSystem(
@@ -52,21 +53,41 @@
                     $sm->get('zfcticketsystem_entry_options')
                 );
             },
-            Service\Category::class => function($sm) {
+            Service\Category::class => function ($sm) {
                 /** @var $sm \Zend\ServiceManager\ServiceLocatorInterface */
                 /** @noinspection PhpParamsInspection */
                 return new Service\Category(
                     $sm->get('zfcticketsystem_admin_category_form'),
                     $sm->get('Doctrine\ORM\EntityManager'),
                     $sm->get('zfcticketsystem_entry_options')
                 );
-            }
+            },
         ],
     ],
     'controllers' => [
-        'invokables' => [
-            'ZfcTicketSystem\Controller\TicketSystem' => 'ZfcTicketSystem\Controller\TicketSystemController',
-            'ZfcTicketSystem\Controller\Admin' => 'ZfcTicketSystem\Controller\AdminController',
+        'aliases' => [
+            'ZfcTicketSystem\Controller\TicketSystem' => Controller\TicketSystemController::class,
+            'ZfcTicketSystem\Controller\Admin' => Controller\AdminController::class,
+        ],
+        'factories' => [
+            Controller\TicketSystemController::class => function ($sm) {
+                /** @var $sm \Zend\ServiceManager\AbstractPluginManager */
+                $config = $sm->getServiceLocator()->get('Config');
+                /** @noinspection PhpParamsInspection */
+                return new Controller\TicketSystemController(
+                    $sm->getServiceLocator()->get('zfcticketsystem_ticketsystem_service'),
+                    $sm->getServiceLocator()->get($config['zfc-ticket-system']['auth_service'])
+                );
+            },
+            Controller\AdminController::class => function ($sm) {
+                /** @var $sm \Zend\ServiceManager\AbstractPluginManager */
+                $config = $sm->getServiceLocator()->get('Config');
+                /** @noinspection PhpParamsInspection */
+                return new Controller\AdminController(
+                    $sm->getServiceLocator()->get('zfcticketsystem_ticketsystem_service'),
+                    $sm->getServiceLocator()->get($config['zfc-ticket-system']['auth_service'])
+                );
+            },
         ],
     ],
     'doctrine' => [

src/ZfcTicketSystem/Controller/AbstractController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace ZfcTicketSystem\Controller;
+
+use Zend\Authentication\AuthenticationService;
+use Zend\Mvc\Controller\AbstractActionController;
+use ZfcTicketSystem\Service\TicketSystem;
+
+class AbstractController extends AbstractActionController
+{
+    /** @var TicketSystem */
+    protected $ticketService;
+    /** @var AuthenticationService */
+    protected $authService;
+
+    /**
+     * AbstractController constructor.
+     * @param TicketSystem $ticketService
+     * @param AuthenticationService $authService
+     */
+    public function __construct(TicketSystem $ticketService, AuthenticationService $authService)
+    {
+        $this->ticketService = $ticketService;
+        $this->authService = $authService;
+    }
+
+    /**
+     * @return TicketSystem
+     */
+    protected function getTicketService()
+    {
+        return $this->ticketService;
+    }
+
+    /**
+     * @return AuthenticationService
+     */
+    protected function getAuthService()
+    {
+        return $this->authService;
+    }
+} 

src/ZfcTicketSystem/Controller/AdminController.php

@@ -4,7 +4,7 @@
 
 use ZfcTicketSystem\Entity\TicketSubject;
 
-class AdminController extends BaseController
+class AdminController extends AbstractController
 {
     /**
      * @return array

src/ZfcTicketSystem/Controller/TicketSystemController.php

@@ -5,9 +5,8 @@
 use Zend\View\Model\ViewModel;
 use ZfcTicketSystem\Entity\TicketSubject;
 
-class TicketSystemController extends BaseController
+class TicketSystemController extends AbstractController
 {
-
     /**
      * @return ViewModel
      */

tests/Bootstrap.php

@@ -1,17 +1,3 @@
 <?php
 
-include __DIR__ . '/../vendor/autoload.php';
-
-use ZfcTicketSystemTest\Util\ServiceManagerFactory;
-
-ini_set('error_reporting', E_ALL);
-
-if (file_exists(__DIR__ . '/TestConfig.php')) {
-    $config = require __DIR__ . '/TestConfig.php';
-} else {
-    throw new \Exception('text config missing');
-}
-
-ServiceManagerFactory::setConfig($config);
-unset($config);
-
+include __DIR__ . '/../vendor/autoload.php';

tests/ZfcTicketSystemTest/Entity/TicketSubjectTest.php

@@ -6,8 +6,8 @@
 
 use SmallUser\Entity\User;
 use ZfcTicketSystem\Entity\TicketCategory;
-use ZfcTicketSystem\Entity\TicketSubject;
 use ZfcTicketSystem\Entity\TicketEntry;
+use ZfcTicketSystem\Entity\TicketSubject;
 
 class TicketSubjectTest extends \PHPUnit_Framework_TestCase
 {

tests/ZfcTicketSystemTest/Util/TestBase.php

@@ -7,15 +7,12 @@
 
 class TestBase extends TestCase
 {
-    /** @var  \Zend\ServiceManager\ServiceManager */
-    protected $serviceManager;
     /** @var  string */
     protected $className;
 
     public function setUp()
     {
         parent::setUp();
-        $this->serviceManager = ServiceManagerFactory::getServiceManager();
     }
 
     /**
@@ -38,9 +35,7 @@ protected function getMethod($methodName)
     protected function getClass($className = null)
     {
         $class = $className ? $className : $this->className;
-        /** @var \Zend\ServiceManager\ServiceManagerAwareInterface $class */
         $class = new $class;
-        $class->setServiceManager($this->serviceManager);
 
         return $class;
     }

tests/ZfcTicketSystemTest/View/Helper/TicketStatusTest.php

@@ -13,7 +13,7 @@ class TicketStatusTest extends TestBase
     public function testInvoke()
     {
         $this->assertContains('unknown', $this->getClass()->__invoke(-1));
-        $this->assertContains('unknown', $this->getClass()->__invoke(array('sdgdsg')));
+        $this->assertContains('unknown', $this->getClass()->__invoke(['sdgdsg']));
         $this->assertNotContains('unknown', $this->getClass()->__invoke(1));
     }
 
@@ -23,8 +23,7 @@ public function testInvoke()
      */
     protected function getClass($className = null)
     {
-        /** @var \Zend\ServiceManager\ServiceManagerAwareInterface $class */
-        $class = new $this->className($this->serviceManager);
+        $class = new $this->className();
 
         return $class;
     }

tests/phpunit.xml

@@ -10,9 +10,9 @@
         processIsolation="false"
         backupGlobals="false"
         syntaxCheck="true"
-        >
+>
     <php>
-        <server name='HTTP_HOST' value='' />
+        <server name='HTTP_HOST' value=''/>
         <server name="SERVER_NAME" value="http://foo.bar"/>
         <server name="SERVER_PORT" value="80"/>
         <server name="REMOTE_ADDR" value="127.1.2.3"/>