tracking instances

Author: mmelograno

src/SplitIO/Component/Common/Di.php

@@ -71,12 +71,19 @@ public static function trackFactory($apiKey)
         $tracked = 1;
         if (isset(self::getInstance()->factoryTracker[$apiKey])) {
             $currentInstances = self::getInstance()->factoryTracker[$apiKey];
-            self::getInstance()->getLogger()->warning(
-                "Factory Instantiation: You already have " . $currentInstances .
-                " factory/ies with this API Key. " .
-                "We recommend keeping only one instance of the factory at all times " .
-                "(Singleton pattern) and reusing it throughout your application."
-            );
+            if ($currentInstances == 1) {
+                self::getInstance()->getLogger()->warning(
+                    "Factory Instantiation: You already have 1 factory with this API Key. " .
+                    "We recommend keeping only one instance of the factory at all times " .
+                    "(Singleton pattern) and reusing it throughout your application."
+                );
+            } else {
+                self::getInstance()->getLogger()->warning(
+                    "Factory Instantiation: You already have " . $currentInstances . " factories with this API Key. " .
+                    "We recommend keeping only one instance of the factory at all times " .
+                    "(Singleton pattern) and reusing it throughout your application."
+                );
+            }
             $tracked = $currentInstances + $tracked;
         } elseif (count(self::getInstance()->factoryTracker) > 0) {
             self::getInstance()->getLogger()->warning(

tests/Suite/InputValidation/FactoryTrackerTest.php

@@ -39,10 +39,10 @@ public function testMultipleClientInstantiation()
         $logger->expects($this->any())
             ->method('warning')
             ->with($this->logicalOr(
-                $this->equalTo("Factory Instantiation: You already have 1 factory/ies with this API Key. "
+                $this->equalTo("Factory Instantiation: You already have 1 factory with this API Key. "
                     . "We recommend keeping only one instance of the factory at all times (Singleton pattern) and reusing "
                     . "it throughout your application."),
-                $this->equalTo("Factory Instantiation: You already have 2 factory/ies with this API Key. "
+                $this->equalTo("Factory Instantiation: You already have 2 factories with this API Key. "
                     . "We recommend keeping only one instance of the factory at all times (Singleton pattern) and reusing "
                     . "it throughout your application."),
                 $this->equalTo("Factory Instantiation: You already have an instance of the Split factory. "