removed UserBase dependence, for the services

src/PServerCMS/Helper/HelperBasic.php

@@ -3,7 +3,6 @@
 
 namespace PServerCMS\Helper;
 
-use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 trait HelperBasic

src/PServerCMS/Helper/HelperForm.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace PServerCMS\Helper;
+
+
+trait HelperForm
+{
+
+
+    /**
+     * @param $serviceName
+     *
+     * @return array|object
+     */
+    abstract function getService( $serviceName );
+}

src/PServerCMS/Service/InvokableBase.php

@@ -1,15 +1,54 @@
 <?php
 namespace PServerCMS\Service;
 
+use PServerCMS\Helper\HelperForm;
 use PServerCMS\Helper\HelperOptions;
 use PServerCMS\Helper\HelperService;
 use PServerCMS\Helper\HelperBasic;
-use SmallUser\Service\InvokableBase as UserBase;
 use Zend\Form\FormInterface;
+use Zend\ServiceManager\ServiceManager as ZendServiceManager;
+use Zend\ServiceManager\ServiceManagerAwareInterface;
 
-abstract class InvokableBase extends UserBase
+abstract class InvokableBase implements ServiceManagerAwareInterface
 {
-    use HelperService, HelperOptions, HelperBasic;
+    use HelperService, HelperOptions, HelperForm, HelperBasic;
+
+    /** @var ZendServiceManager */
+    protected $serviceManager;
+    /** @var \Zend\Mvc\Controller\Plugin\FlashMessenger */
+    protected $flashMessenger;
+
+    /**
+     * @return ZendServiceManager
+     */
+    public function getServiceManager()
+    {
+        return $this->serviceManager;
+    }
+
+    /**
+     * @param ZendServiceManager $serviceManager
+     *
+     * @return $this
+     */
+    public function setServiceManager( ZendServiceManager $serviceManager )
+    {
+        $this->serviceManager = $serviceManager;
+
+        return $this;
+    }
+
+    /**
+     * @return \Zend\Mvc\Controller\Plugin\FlashMessenger
+     */
+    protected function getFlashMessenger()
+    {
+        if (!$this->flashMessenger) {
+            $this->flashMessenger = $this->getControllerPluginManager()->get( 'flashMessenger' );
+        }
+
+        return $this->flashMessenger;
+    }
 
     /**
      * @param $userId

src/PServerCMS/Service/User.php

@@ -6,6 +6,7 @@
 use PServerCMS\Entity\UserCodes;
 use PServerCMS\Entity\UserInterface;
 use PServerCMS\Helper\HelperOptions;
+use PServerCMS\Helper\HelperForm;
 use PServerCMS\Helper\HelperBasic;
 use PServerCMS\Helper\HelperService;
 use SmallUser\Entity\UserInterface as SmallUserInterface;
@@ -25,7 +26,7 @@
  */
 class User extends \SmallUser\Service\User
 {
-    use HelperService, HelperOptions, HelperBasic;
+    use HelperService, HelperOptions, HelperForm, HelperBasic;
 
     /**
      * @param array $data