From 8e52da6df2597e753fa7c372d8b5e299ac0f11fc Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sun, 23 Jul 2017 22:52:22 +0200
Subject: [PATCH] - code cleanup

---
 app/main/controller/api/user.php |  2 +-
 app/main/lib/ccpclient.php       | 16 ++++++++--------
 app/main/lib/config.php          | 30 ++++++++++++++----------------
 app/main/lib/socket.php          |  2 ++
 index.php                        |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/main/controller/api/user.php b/app/main/controller/api/user.php
index e49eed7a..41bfbdc7 100644
--- a/app/main/controller/api/user.php
+++ b/app/main/controller/api/user.php
@@ -106,7 +106,7 @@ class User extends Controller\Controller{
      * -> return character data (if valid)
      * @param \Base $f3
      */
-    public function getCookieCharacter($f3){
+    public function getCookieCharacter(\Base $f3){
         $data = $f3->get('POST');
 
         $return = (object) [];
diff --git a/app/main/lib/ccpclient.php b/app/main/lib/ccpclient.php
index ab0eb6af..aef5a774 100644
--- a/app/main/lib/ccpclient.php
+++ b/app/main/lib/ccpclient.php
@@ -15,22 +15,22 @@ class CcpClient extends \Prefab {
 
     private $apiClient;
 
-    public function __construct(){
-        $f3 = \Base::instance();
-
-        $this->apiClient = $this->getClient($f3);
-
+    public function __construct(\Base $f3){
+        $this->apiClient = $this->getClient();
         $f3->set('ccpClient', $this);
     }
 
-
-    protected function getClient($f3){
+    /**
+     * get ApiClient instance
+     * @return ApiClient|null
+     */
+    protected function getClient(){
         $client = null;
 
         if( !class_exists(ApiClient::class) ){
             LogController::getLogger('ERROR')->write($this->getMissingClientError());
         }else{
-            $client = new ApiClient($f3);
+            $client = new ApiClient();
             $client->setUrl( Config::getEnvironmentData('CCP_ESI_URL') );
             $client->setDatasource( Config::getEnvironmentData('CCP_ESI_DATASOURCE') );
             $client->setUserAgent($this->getUserAgent());
diff --git a/app/main/lib/config.php b/app/main/lib/config.php
index c2f8c0cf..c788d9d1 100644
--- a/app/main/lib/config.php
+++ b/app/main/lib/config.php
@@ -33,31 +33,28 @@ class Config extends \Prefab {
      */
     private $serverConfigData                       = [];
 
-    public function __construct(){
+    public function __construct(\Base $f3){
         // set server data
         // -> CGI params (Nginx)
         // -> .htaccess (Apache)
         $this->setServerData();
         // set environment data
-        $this->setAllEnvironmentData();
+        $this->setAllEnvironmentData($f3);
         // set hive configuration variables
         // -> overwrites default configuration
-        $this->setHiveVariables();
+        $this->setHiveVariables($f3);
     }
 
     /**
      * get environment configuration data
+     * @param \Base $f3
      * @return array|null
      */
-    protected function getAllEnvironmentData(){
-        $f3 = \Base::instance();
-        $environmentData = null;
-
-        if( $f3->exists(self::HIVE_KEY_ENVIRONMENT) ){
-            $environmentData = $f3->get(self::HIVE_KEY_ENVIRONMENT);
-        }else{
-            $environmentData =  $this->setAllEnvironmentData();
+    protected function getAllEnvironmentData(\Base $f3){
+        if( !$f3->exists(self::HIVE_KEY_ENVIRONMENT, $environmentData) ){
+            $environmentData =  $this->setAllEnvironmentData($f3);
         }
+
         return $environmentData;
     }
 
@@ -66,9 +63,9 @@ class Config extends \Prefab {
      * -> can be  overwritten in environments.ini OR ENV-Vars
      * -> see: https://github.com/exodus4d/pathfinder/issues/175
      * that depend on environment settings
+     * @param \Base $f3
      */
-    protected function setHiveVariables(){
-        $f3 = \Base::instance();
+    protected function setHiveVariables(\Base $f3){
         // hive keys that can be overwritten
         $hiveKeys = ['BASE', 'URL', 'DEBUG', 'CACHE'];
 
@@ -81,11 +78,11 @@ class Config extends \Prefab {
 
     /**
      * set all environment configuration data
-     * @return array|null
+     * @param \Base $f3
+     * @return array|mixed|null
      */
-    protected function setAllEnvironmentData(){
+    protected function setAllEnvironmentData(\Base $f3){
         $environmentData = null;
-        $f3 = \Base::instance();
 
         if( !empty($this->serverConfigData['ENV']) ){
             // get environment config from $_SERVER data
@@ -122,6 +119,7 @@ class Config extends \Prefab {
             $f3->set(self::HIVE_KEY_ENVIRONMENT, $environmentData);
         }
 
+
         return $environmentData;
     }
 
diff --git a/app/main/lib/socket.php b/app/main/lib/socket.php
index 25d9030e..fb96c108 100644
--- a/app/main/lib/socket.php
+++ b/app/main/lib/socket.php
@@ -119,6 +119,8 @@ class Socket {
         ];
 
         $this->socket->connect($this->socketUri);
+        //$this->socket->send(json_encode($send), \ZMQ::MODE_DONTWAIT);
+
         $this->socket->send(json_encode($send));
         $this->socket->disconnect($this->socketUri);
 
diff --git a/index.php b/index.php
index d6c505ed..1cc1b350 100644
--- a/index.php
+++ b/index.php
@@ -12,10 +12,10 @@ $f3 = require_once('app/lib/base.php');
 $f3->config('app/config.ini', true);
 
 // load environment dependent config
-lib\Config::instance();
+lib\Config::instance($f3);
 
 // initiate CCP API Client (ESI)
-lib\CcpClient::instance();
+lib\CcpClient::instance($f3);
 
 // initiate cron-jobs
 Cron::instance();