removed unnecesary private methods

Author: mmelograno

src/SplitIO/Component/Common/Di.php

@@ -9,7 +9,7 @@
  */
 class Di
 {
-    private \SplitIO\Component\Log\Logger|null $logger = null;
+    private \SplitIO\Component\Log\Logger $logger;
 
     private int $factoryTracker = 0;
 
@@ -62,91 +62,55 @@ public function __wakeup()
     {
     }
 
-    private function __trackFactory()
-    {
-        $this->factoryTracker += 1;
-        return $this->factoryTracker;
-    }
-
-    /**
-     * @param \SplitIO\Component\Log\Logger $logger
-     */
-    private function __setLogger(Logger $logger)
-    {
-        if (is_null($this->logger)) {
-            $this->logger = $logger;
-            return;
-        }
-        $this->logger->debug("logger was set before, ignoring new instance provided");
-    }
-
-    /**
-     * @return null|\SplitIO\Component\Log\Logger
-     */
-    private function __getLogger()
-    {
-        return $this->logger;
-    }
-
-    /**
-     * @param string $ip
-     */
-    private function __setIPAddress(string $ip)
-    {
-        if (empty($this->ipAddress)) {
-            $this->ipAddress = $ip;
-            return;
-        }
-        if (!(is_null($this->logger))) {
-            $this->logger->debug("IPAddress was set before, ignoring new instance provided");
-        }
-    }
-
-    /**
-     * @return null|string
-     */
-    private function __getIPAddress()
-    {
-        return $this->ipAddress;
-    }
-
     /**
      * @return int
      */
     public static function trackFactory()
     {
-        return self::getInstance()->__trackFactory();
+        self::getInstance()->factoryTracker += 1;
+        return self::getInstance()->factoryTracker;
     }
 
     /**
      * @param \SplitIO\Component\Log\Logger $logger
      */
     public static function setLogger(Logger $logger)
     {
-        self::getInstance()->__setLogger($logger);
+        if (!isset(self::getInstance()->logger)) {
+            self::getInstance()->logger = $logger;
+            return;
+        }
+        self::getInstance()->logger->debug("logger was set before, ignoring new instance provided");
     }
 
     /**
-     * @return null|\SplitIO\Component\Log\Logger
+     * @return \SplitIO\Component\Log\Logger
      */
     public static function getLogger()
     {
-        return self::getInstance()->__getLogger();
+        if (!isset(self::getInstance()->logger)) {
+            throw new Exception("logger was not set yet");
+        }
+        return self::getInstance()->logger;
     }
 
     /**
      * @param string $ip
      */
     public static function setIPAddress(string $ip)
     {
-        self::getInstance()->__setIPAddress($ip);
+        if (empty(self::getInstance()->ipAddress)) {
+            self::getInstance()->ipAddress = $ip;
+            return;
+        }
+        self::getInstance()->getLogger()->debug("IPAddress was set before, ignoring new instance provided");
     }
 
     /**
-     * @return null|string
+     * @return string
      */
     public static function getIPAddress()
     {
-        return self::getInstance()->__getIPAddress();
+        return self::getInstance()->ipAddress;
     }
 }

src/SplitIO/Sdk.php

@@ -31,17 +31,15 @@ public static function factory($apiKey = 'localhost', array $options = array())
         //Adding API Key into args array.
         $options['apiKey'] = $apiKey;
 
+        //Tracking Factory Instantiation
         self::registerInstance();
 
-        if ($apiKey == 'localhost') {
-            //Register Logger
-            self::registerLogger((isset($options['log'])) ? $options['log'] : array());
+        //Register Logger
+        self::registerLogger((isset($options['log'])) ? $options['log'] : array());
 
+        if ($apiKey == 'localhost') {
             return new LocalhostSplitFactory($options);
         } else {
-            //Register Logger
-            self::registerLogger((isset($options['log'])) ? $options['log'] : array());
-
             //Register Cache
             $cache = self::configureCache((isset($options['cache'])) ? $options['cache'] : array());