Merge pull request #329 from alphadevx/feature/127-service-factory

Feature/127 service factory
alphadevx · Mar 10, 2018 · c2ccd81 · c2ccd81
2 parents f251924 + 12ac36b
commit c2ccd81
Show file tree

Hide file tree

Showing 66 changed files with 406 additions and 1,291 deletions.
diff --git a/Alpha/Controller/ArticleController.php b/Alpha/Controller/ArticleController.php
@@ -9,7 +9,7 @@
 use Alpha\Util\Extension\TCPDFFacade;
 use Alpha\Util\Http\Request;
 use Alpha\Util\Http\Response;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Util\File\FileUtils;
 use Alpha\Model\Article;
 use Alpha\Model\ArticleComment;
@@ -558,7 +558,7 @@ public function before_displayPageFoot_callback()
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $html = '';
         $params = $this->request->getParams();
@@ -635,7 +635,7 @@ private function renderComments()
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $html = '';
 
@@ -707,7 +707,7 @@ private function renderVotes()
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $URL = FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType=Alpha\Model\ArticleVote');
         $html = '<form action="'.$URL.'" method="post" accept-charset="UTF-8">';

diff --git a/Alpha/Controller/CacheController.php b/Alpha/Controller/CacheController.php
@@ -7,7 +7,7 @@
 use Alpha\Util\File\FileUtils;
 use Alpha\Util\Security\SecurityUtils;
 use Alpha\Util\Http\Response;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Exception\IllegalArguementException;
 use Alpha\Exception\SecurityException;
 use Alpha\Exception\AlphaException;
@@ -213,7 +213,7 @@ public function doPOST($request)
 
                     $config = ConfigProvider::getInstance();
                     $sessionProvider = $config->get('session.provider.name');
-                    $session = SessionProviderFactory::getInstance($sessionProvider);
+                    $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
                     self::$logger->info('Cache contents deleted successfully by user ['.$session->get('currentUser')->get('username').'].');
                 } catch (AlphaException $e) {

diff --git a/Alpha/Controller/Controller.php b/Alpha/Controller/Controller.php
@@ -8,7 +8,7 @@
 use Alpha\Util\Config\ConfigProvider;
 use Alpha\Util\Security\SecurityUtils;
 use Alpha\Util\Helper\Validator;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Util\Http\Request;
 use Alpha\Util\Http\Response;
 use Alpha\Util\Logging\Logger;
@@ -273,7 +273,7 @@ public function __construct($visibility = 'Public')
         }
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         if ($session->get('unitOfWork') !== false && is_array($session->get('unitOfWork'))) {
             $this->setUnitOfWork($session->get('unitOfWork'));
@@ -490,7 +490,7 @@ public function setUnitOfWork($jobs)
         // clear out any previous unit of work from the session
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
         $session->delete('unitOfWork');
         $this->firstJob = null;
         $this->previousJob = null;
@@ -577,7 +577,7 @@ public function setUnitStartTime($year, $month, $day, $hour, $minute, $second)
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $this->unitStartTime->setTimestampValue($year, $month, $day, $hour, $minute, $second);
         $session->set('unitStartTime', $this->unitStartTime->getValue());
@@ -619,7 +619,7 @@ public function setUnitEndTime($year, $month, $day, $hour, $minute, $second)
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $this->unitEndTime->setTimestampValue($year, $month, $day, $hour, $minute, $second);
         $session->set('unitEndTime', $this->unitEndTime->getValue());
@@ -709,7 +709,7 @@ public function markDirty($object)
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $session->set('dirtyObjects', $this->dirtyObjects);
 
@@ -754,7 +754,7 @@ public function markNew($object)
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $session->set('newObjects', $this->newObjects);
 
@@ -893,7 +893,7 @@ public function clearUnitOfWorkAttributes()
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $session->delete('unitOfWork');
         $this->unitOfWork = null;
@@ -1008,7 +1008,7 @@ public function accessError()
         $config = ConfigProvider::getInstance();
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         if ($session->get('currentUser') !== false) {
             self::$logger->warn('The user ['.$session->get('currentUser')->get('email').'] attempted to access the resource ['.$this->request->getURI().'] but was denied due to insufficient rights');
@@ -1044,7 +1044,7 @@ public function checkRights()
         $config = ConfigProvider::getInstance();
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         if (method_exists($this, 'before_checkRights_callback')) {
             $this->{'before_checkRights_callback'}();
@@ -1256,7 +1256,7 @@ public function setStatusMessage($message)
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $this->statusMessage = $message;
         $session->set('statusMessage', $message);
@@ -1275,7 +1275,7 @@ public function getStatusMessage()
     {
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $session->delete('statusMessage');
 
@@ -1682,7 +1682,7 @@ public function after_displayPageHead_callback()
                 $config = ConfigProvider::getInstance();
 
                 $sessionProvider = $config->get('session.provider.name');
-                $session = SessionProviderFactory::getInstance($sessionProvider);
+                $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
                 if ($session->get('currentUser') !== false) {
                     $passwordResetRequired = SecurityUtils::checkAdminPasswordIsDefault($session->get('currentUser')->get('password'));

diff --git a/Alpha/Controller/InstallController.php b/Alpha/Controller/InstallController.php
@@ -5,7 +5,7 @@
 use Alpha\Util\Logging\Logger;
 use Alpha\Util\Config\ConfigProvider;
 use Alpha\Util\Http\Response;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Model\ActiveRecord;
 use Alpha\Model\Rights;
 use Alpha\Model\Person;
@@ -105,7 +105,7 @@ public function doGET($request)
         $config = ConfigProvider::getInstance();
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         // if there is nobody logged in, we will send them off to the Login controller to do so before coming back here
         if ($session->get('currentUser') === false) {
@@ -122,7 +122,7 @@ public function doGET($request)
         }
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         $body = View::displayPageHead($this);
 
@@ -462,7 +462,7 @@ public function checkRights()
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         if ($this->getVisibility() == 'Public') {
             self::$logger->debug('<<checkRights [true]');

diff --git a/Alpha/Controller/LoginController.php b/Alpha/Controller/LoginController.php
@@ -6,7 +6,7 @@
 use Alpha\Util\Config\ConfigProvider;
 use Alpha\Util\Http\Request;
 use Alpha\Util\Http\Response;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Util\Helper\Validator;
 use Alpha\View\View;
 use Alpha\View\PersonView;
@@ -195,7 +195,7 @@ public function doPOST($request)
                         $admin->set('ID', '00000000001');
 
                         $sessionProvider = $config->get('session.provider.name');
-                        $session = SessionProviderFactory::getInstance($sessionProvider);
+                        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
                         $session->set('currentUser', $admin);
 
                         $response = new Response(301);
@@ -308,7 +308,7 @@ protected function doLoginAndRedirect($password)
         if (!$this->personObject->isTransient() && $this->personObject->get('state') == 'Active') {
             if (password_verify($password, $this->personObject->get('password'))) {
                 $sessionProvider = $config->get('session.provider.name');
-                $session = SessionProviderFactory::getInstance($sessionProvider);
+                $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
                 $session->set('currentUser', $this->personObject);
 
                 self::$logger->debug('Logging in ['.$this->personObject->get('email').'] at ['.date('Y-m-d H:i:s').']');

diff --git a/Alpha/Controller/LogoutController.php b/Alpha/Controller/LogoutController.php
@@ -4,7 +4,7 @@
 
 use Alpha\Util\Logging\Logger;
 use Alpha\Util\Config\ConfigProvider;
-use Alpha\Util\Http\Session\SessionProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\Util\Http\Response;
 use Alpha\Model\Person;
 use Alpha\View\View;
@@ -77,7 +77,7 @@ public function __construct()
 
         $config = ConfigProvider::getInstance();
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
 
         if ($session->get('currentUser') !== false) {
             $this->setRecord($session->get('currentUser'));
@@ -114,7 +114,7 @@ public function doGET($request)
         }
 
         $sessionProvider = $config->get('session.provider.name');
-        $session = SessionProviderFactory::getInstance($sessionProvider);
+        $session = ServiceFactory::getInstance($sessionProvider, 'Alpha\Util\Http\Session\SessionProviderInterface');
         $session->destroy();
 
         $body = View::displayPageHead($this);

diff --git a/Alpha/Controller/SearchController.php b/Alpha/Controller/SearchController.php
@@ -8,7 +8,7 @@
 use Alpha\Util\Config\ConfigProvider;
 use Alpha\Util\Http\Request;
 use Alpha\Util\Http\Response;
-use Alpha\Util\Search\SearchProviderFactory;
+use Alpha\Util\Service\ServiceFactory;
 use Alpha\View\View;
 use Alpha\View\Widget\Button;
 use Alpha\Controller\Front\FrontController;
@@ -152,7 +152,7 @@ public function doGET($request)
 
             $KPI->logStep('log search query');
 
-            $provider = SearchProviderFactory::getInstance('Alpha\Util\Search\SearchProviderTags');
+            $provider = ServiceFactory::getInstance('Alpha\Util\Search\SearchProviderTags', 'Alpha\Util\Search\SearchProviderInterface');
 
             // if a Record name is provided, only search tags on that class, otherwise search all records
             if (isset($params['ActiveRecordType'])) {