drop zf2

kokspflanze · Mar 20, 2017 · 2deee39 · 2deee39
1 parent d44ffb3
commit 2deee39
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 76 deletions.
diff --git a/Module.php b/Module.php
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,7 +1,9 @@
 <?php
 
+use Zend\Router\Http\Segment;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use ZfcTicketSystem\Controller;
+use ZfcTicketSystem\Entity;
 use ZfcTicketSystem\Form;
 use ZfcTicketSystem\Options;
 use ZfcTicketSystem\View\Helper;
@@ -11,7 +13,7 @@
     'router' => [
         'routes' => [
             'zfc-ticketsystem' => [
-                'type' => 'segment',
+                'type' => Segment::class,
                 'options' => [
                     'route' => '/panel/ticket[-:action[-:id]].html',
                     'constraints' => [
@@ -25,7 +27,7 @@
                 ],
             ],
             'zfc-ticketsystem-admin' => [
-                'type' => 'segment',
+                'type' => Segment::class,
                 'options' => [
                     'route' => '/admin/ticket[-:action[-:id]][-:type].html',
                     'constraints' => [
@@ -72,7 +74,7 @@
     'doctrine' => [
         'driver' => [
             'application_entities' => [
-                'class' => 'Doctrine\ORM\Mapping\Driver\AnnotationDriver',
+                'class' => \Doctrine\ORM\Mapping\Driver\AnnotationDriver::class,
                 'cache' => 'array',
                 'paths' => [__DIR__ . '/../src/ZfcTicketSystem/Entity']
             ],
@@ -96,10 +98,10 @@
     'zfc-ticket-system' => [
         'auth_service' => 'user_auth_service',
         'entity' => [
-            'ticket_category' => 'ZfcTicketSystem\Entity\TicketCategory',
-            'ticket_entry' => 'ZfcTicketSystem\Entity\TicketEntry',
-            'ticket_subject' => 'ZfcTicketSystem\Entity\TicketSubject',
-            'user' => 'SmallUser\Entity\User'
+            'ticket_category' => Entity\TicketCategory::class,
+            'ticket_entry' => Entity\TicketEntry::class,
+            'ticket_subject' => Entity\TicketSubject::class,
+            'user' => \SmallUser\Entity\User::class
         ],
     ],
     'view_helpers' => [

diff --git a/src/ZfcTicketSystem/Controller/AdminFactory.php b/src/ZfcTicketSystem/Controller/AdminFactory.php
@@ -3,11 +3,8 @@
 
 namespace ZfcTicketSystem\Controller;
 
-
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 use ZfcTicketSystem\Service\TicketSystem;
 
 class AdminFactory implements FactoryInterface
@@ -28,13 +25,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         );
     }
 
-    /**
-     * @param ServiceLocatorInterface|AbstractPluginManager $serviceLocator
-     * @return AdminController
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        return $this($serviceLocator->getServiceLocator(), AdminController::class);
-    }
-
 }
diff --git a/src/ZfcTicketSystem/Controller/TicketSystemFactory.php b/src/ZfcTicketSystem/Controller/TicketSystemFactory.php
@@ -3,16 +3,18 @@
 
 namespace ZfcTicketSystem\Controller;
 
-
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 use ZfcTicketSystem\Service\TicketSystem;
 
 class TicketSystemFactory implements FactoryInterface
 {
-
+    /**
+     * @param ContainerInterface $container
+     * @param string $requestedName
+     * @param array|null $options
+     * @return TicketSystemController
+     */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $config = $container->get('config');
@@ -23,13 +25,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         );
     }
 
-    /**
-     * @param ServiceLocatorInterface|AbstractPluginManager $serviceLocator
-     * @return TicketSystemController
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        return $this($serviceLocator->getServiceLocator(), TicketSystemController::class);
-    }
-
 }
diff --git a/src/ZfcTicketSystem/Service/CategoryFactory.php b/src/ZfcTicketSystem/Service/CategoryFactory.php
@@ -3,11 +3,9 @@
 
 namespace ZfcTicketSystem\Service;
 
-
 use Doctrine\ORM\EntityManager;
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class CategoryFactory implements FactoryInterface
 {
@@ -27,14 +25,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         );
     }
 
-    /**
-     * @param ServiceLocatorInterface $serviceLocator
-     * @return Category
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        /** @noinspection PhpParamsInspection */
-        return $this($serviceLocator, Category::class);
-    }
-
 }
diff --git a/src/ZfcTicketSystem/Service/TicketSystemFactory.php b/src/ZfcTicketSystem/Service/TicketSystemFactory.php
@@ -1,13 +1,10 @@
 <?php
 
-
 namespace ZfcTicketSystem\Service;
 
-
 use Doctrine\ORM\EntityManager;
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class TicketSystemFactory implements FactoryInterface
 {
@@ -28,14 +25,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         );
     }
 
-    /**
-     * @param ServiceLocatorInterface $serviceLocator
-     * @return TicketSystem
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        /** @noinspection PhpParamsInspection */
-        return $this($serviceLocator, TicketSystem::class);
-    }
-
 }
diff --git a/src/ZfcTicketSystem/View/Helper/NewTicketFactory.php b/src/ZfcTicketSystem/View/Helper/NewTicketFactory.php
@@ -3,11 +3,8 @@
 
 namespace ZfcTicketSystem\View\Helper;
 
-
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class NewTicketFactory implements FactoryInterface
 {
@@ -24,13 +21,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         );
     }
 
-    /**
-     * @param ServiceLocatorInterface|AbstractPluginManager $serviceLocator
-     * @return NewTicketWidget
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        return $this($serviceLocator->getServiceLocator(), NewTicketWidget::class);
-    }
-
 }