Merge branch 'task/multipleFactory' of github.com:splitio/php-client into task/multipleFactory

mmelograno · mmelograno · commit 0170df4820af · 2023-01-18T16:56:26.000-03:00
diff --git a/src/SplitIO/Component/Cache/ImpressionCache.php b/src/SplitIO/Component/Cache/ImpressionCache.php
@@ -2,7 +2,6 @@
 namespace SplitIO\Component\Cache;
 
 use SplitIO\Component\Common\Context;
-use SplitIO\Component\Cache\KeyFactory;
 use SplitIO\Sdk\QueueMetadataMessage;
 use SplitIO\Component\Cache\Pool;
 
diff --git a/src/SplitIO/Component/Cache/SplitCache.php b/src/SplitIO/Component/Cache/SplitCache.php
@@ -44,7 +44,7 @@ private static function getSplitNameFromCacheKey($key)
     }
 
     /**
-     * @return long
+     * @return int
      */
     public function getChangeNumber()
     {
@@ -64,7 +64,7 @@ public function getSplit($splitName)
 
     /**
      * @param array $splitNames
-     * @return string JSON representation
+     * @return array
      */
     public function getSplits($splitNames)
     {
diff --git a/src/SplitIO/Component/Cache/SplitCacheInterface.php b/src/SplitIO/Component/Cache/SplitCacheInterface.php
@@ -4,7 +4,7 @@
 interface SplitCacheInterface
 {
     /**
-     * @return long
+     * @return int
      */
     public function getChangeNumber();
 
diff --git a/src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php b/src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php
@@ -2,7 +2,6 @@
 namespace SplitIO\Component\Cache\Storage\Adapter;
 
 use SplitIO\Component\Cache\Storage\Exception\AdapterException;
-use SplitIO\Component\Cache\Item;
 use SplitIO\Component\Utils as SplitIOUtils;
 use SplitIO\Component\Common\Context;
 
diff --git a/src/SplitIO/Component/Cache/Storage/Adapter/SafeRedisWrapper.php b/src/SplitIO/Component/Cache/Storage/Adapter/SafeRedisWrapper.php
@@ -1,9 +1,6 @@
 <?php
 namespace SplitIO\Component\Cache\Storage\Adapter;
 
-use SplitIO\Component\Cache\Storage\Exception\AdapterException;
-use SplitIO\Component\Cache\Item;
-use SplitIO\Component\Utils as SplitIOUtils;
 use SplitIO\Component\Common\Context;
 
 /**
diff --git a/src/SplitIO/Component/Common/Context.php b/src/SplitIO/Component/Common/Context.php
@@ -18,14 +18,14 @@ class Context
         . "Make sure you definitely want this additional instance. We recommend keeping only one instance of "
         . "the factory at all times (Singleton pattern) and reusing it throughout your application.";
 
-    private \SplitIO\Component\Log\Logger $logger;
+    private Logger $logger;
 
     private array $factoryTracker = array();
 
     private string $ipAddress = "";
 
     /**
-     * @var Singleton The reference to *Singleton* instance of this class
+     * @var Context The reference to *Singleton* instance of this class
      */
     private static $instance;
 
diff --git a/src/SplitIO/Component/Initialization/LoggerFactory.php b/src/SplitIO/Component/Initialization/LoggerFactory.php
@@ -16,7 +16,7 @@ class LoggerFactory
      * Builds defaultLogger
      *
      * @param $options
-     * @return SplitIO\Component\Log\Handler
+     * @return \SplitIO\Component\Log\Handler\LogHandlerInterface
      */
     private static function buildAdapter(array $options)
     {
@@ -42,7 +42,7 @@ private static function buildAdapter(array $options)
      * Builds logger
      *
      * @param $options
-     * @return SplitIO\Component\Log\Logger
+     * @return \SplitIO\Component\Log\Logger
      */
     public static function setupLogger(array $options)
     {
diff --git a/src/SplitIO/Component/Log/Logger.php b/src/SplitIO/Component/Log/Logger.php
@@ -1,7 +1,6 @@
 <?php
 namespace SplitIO\Component\Log;
 
-use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use \SplitIO\Component\Log\Handler\LogHandlerInterface;
 use SplitIO\Component\Log\Handler\VoidHandler;
diff --git a/src/SplitIO/Engine.php b/src/SplitIO/Engine.php
@@ -2,7 +2,6 @@
 namespace SplitIO;
 
 use SplitIO\Grammar\Split as SplitGrammar;
-use SplitIO\Grammar\Condition;
 use SplitIO\Engine\Splitter;
 use SplitIO\Grammar\Condition\ConditionTypeEnum;
 use SplitIO\Sdk\Impressions\ImpressionLabel;
diff --git a/src/SplitIO/Engine/Hash/HashFactory.php b/src/SplitIO/Engine/Hash/HashFactory.php
@@ -6,7 +6,7 @@ class HashFactory
 {
     /**
      * @param $algo
-     * @return \SplitIO\Engine\HashInterface
+     * @return \SplitIO\Engine\Hash\HashInterface
      */
     public static function getHashAlgorithm($algo)
     {
diff --git a/src/SplitIO/Engine/Splitter.php b/src/SplitIO/Engine/Splitter.php
@@ -8,9 +8,9 @@
 class Splitter
 {
     /**
-     * @param HashAlgorithmEnum $algo
+     * @param \SplitIO\Engine\Hash\HashAlgorithmEnum $algo
      * @param string $key
-     * @param long $seed
+     * @param int $seed
      * @return int
      */
     public static function getBucket($algo, $key, $seed)
@@ -23,9 +23,9 @@ public static function getBucket($algo, $key, $seed)
 
     /**
      * @param string $key
-     * @param long $seed
+     * @param int $seed
      * @param array $partitions
-     * @param HashAlgorithmEnum $algo
+     * @param \SplitIO\Engine\Hash\HashAlgorithmEnum $algo
      * @return null|string
      */
     public static function getTreatment($key, $seed, $partitions, $algo)
diff --git a/src/SplitIO/Grammar/Condition/Matcher/Dependency.php b/src/SplitIO/Grammar/Condition/Matcher/Dependency.php
@@ -2,7 +2,6 @@
 namespace SplitIO\Grammar\Condition\Matcher;
 
 use SplitIO\Grammar\Condition\Matcher;
-use SplitIO\Sdk\Key;
 use SplitIO\Exception\Exception;
 
 class Dependency
diff --git a/src/SplitIO/Grammar/Condition/Matcher/Segment.php b/src/SplitIO/Grammar/Condition/Matcher/Segment.php
@@ -1,7 +1,6 @@
 <?php
 namespace SplitIO\Grammar\Condition\Matcher;
 
-use SplitIO\Component\Cache\SegmentCache;
 use SplitIO\Engine\Hash\Murmur3Hash;
 use SplitIO\Grammar\Condition\Matcher;
 use SplitIO\Exception\Exception;
diff --git a/src/SplitIO/Grammar/Split.php b/src/SplitIO/Grammar/Split.php
@@ -146,7 +146,7 @@ public function getTreatments()
     }
 
     /**
-     * @return HashAlgorithmEnum
+     * @return \SplitIO\Engine\Hash\HashAlgorithmEnum
      */
     public function getAlgo()
     {
diff --git a/src/SplitIO/Sdk.php b/src/SplitIO/Sdk.php
@@ -1,14 +1,11 @@
 <?php
 namespace SplitIO;
 
-use SplitIO\Component\Initialization\CacheTrait;
 use SplitIO\Component\Initialization\LoggerFactory;
-use SplitIO\Component\Common\ServiceProvider;
 use SplitIO\Exception\Exception;
 use SplitIO\Sdk\Factory\LocalhostSplitFactory;
 use SplitIO\Sdk\Factory\SplitFactory;
 use SplitIO\Component\Common\Context;
-use SplitIO\Engine\Splitter;
 use SplitIO\Component\Cache\Pool;
 
 class Sdk
@@ -88,6 +85,6 @@ private static function configureCache(array $options)
 
     private static function setIP($ip)
     {
-        \SplitIO\Component\Common\Context::setIPAddress($ip);
+        Context::setIPAddress($ip);
     }
 }
diff --git a/src/SplitIO/Sdk/Factory/SplitFactory.php b/src/SplitIO/Sdk/Factory/SplitFactory.php
@@ -1,10 +1,7 @@
 <?php
 namespace SplitIO\Sdk\Factory;
 
-use SplitIO\Component\Stats\Latency;
-use SplitIO\Exception\TimeOutException;
 use SplitIO\Sdk\Client;
-use SplitIO\Sdk\LocalhostClient;
 use SplitIO\Sdk\Manager\SplitManager;
 use SplitIO\Component\Cache\Pool;
 use SplitIO\Component\Cache\EventsCache;
diff --git a/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php b/src/SplitIO/Sdk/Manager/LocalhostSplitManager.php
@@ -74,6 +74,11 @@ public function splits()
         return $_splits;
     }
 
+    /**
+     * Return split
+     * @param mixed $featureName
+     * @return SplitView|null
+     */
     public function split($featureName)
     {
         $featureName = InputValidator::validateFeatureName($featureName, 'split');
diff --git a/src/SplitIO/Sdk/Manager/SplitManager.php b/src/SplitIO/Sdk/Manager/SplitManager.php
@@ -2,7 +2,6 @@
 namespace SplitIO\Sdk\Manager;
 
 use \stdClass;
-use SplitIO\Grammar\Condition;
 use SplitIO\Grammar\Split;
 use SplitIO\Split as SplitApp;
 use SplitIO\Component\Cache\SplitCache;
@@ -57,7 +56,7 @@ public function split($featureName)
 
     /**
      * @param $splitRepresentation
-     * @return SplitView
+     * @return null|SplitView
      */
     private static function parseSplitView($splitRepresentation)
     {
diff --git a/src/SplitIO/Sdk/Validator/InputValidator.php b/src/SplitIO/Sdk/Validator/InputValidator.php
@@ -5,8 +5,6 @@
 use SplitIO\Split as SplitApp;
 use SplitIO\Sdk\Key;
 use SplitIO\Component\Utils as SplitIOUtils;
-use SplitIO\Component\Cache\SplitCache;
-use SplitIO\Grammar\Condition\Partition\TreatmentEnum;
 use SplitIO\Sdk\Impressions\ImpressionLabel;
 
 const MAX_LENGTH = 250;
diff --git a/src/SplitIO/Split.php b/src/SplitIO/Split.php
@@ -7,7 +7,7 @@ class Split
 {
 
     /**
-     * @return null|\Psr\Log\LoggerInterface
+     * @return \Splitio\Component\Log\Logger
      */
     public static function logger()
     {
diff --git a/src/SplitIO/functions.php b/src/SplitIO/functions.php
@@ -1,8 +1,6 @@
 <?php
 namespace SplitIO;
 
-use SplitIO\Grammar\Condition\Partition\TreatmentEnum;
-
 function version()
 {
     return Version::CURRENT;
diff --git a/tests/Suite/Adapter/RedisAdapterTest.php b/tests/Suite/Adapter/RedisAdapterTest.php
@@ -3,9 +3,6 @@
 namespace SplitIO\Test\Suite\Adapter;
 
 use SplitIO\Component\Cache\Storage\Adapter\PRedis;
-use SplitIO\Component\Cache\Storage\Exception\AdapterException;
-use \Predis\Response\ServerException;
-use \Predis\ClientException;
 use SplitIO\Test\Suite\Redis\ReflectiveTools;
 
 class RedisAdapterTest extends \PHPUnit\Framework\TestCase
@@ -16,8 +13,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/Attributes/SdkAttributesTest.php b/tests/Suite/Attributes/SdkAttributesTest.php
@@ -1,11 +1,6 @@
 <?php
 namespace SplitIO\Test\Suite\Engine;
 
-use Monolog\Logger;
-use Monolog\Handler\ErrorLogHandler;
-use SplitIO\Component\Cache\SegmentCache;
-use SplitIO\Component\Cache\SplitCache;
-
 use SplitIO\Test\Utils;
 
 class SdkAttributesTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/Suite/Component/KeysStaticMethodsTest.php b/tests/Suite/Component/KeysStaticMethodsTest.php
@@ -2,10 +2,7 @@
 
 namespace SplitIO\Test\Suite\Component;
 
-use SplitIO\Component\Cache\ImpressionCache;
 use SplitIO\Component\Cache\SplitCache;
-use SplitIO\Component\Cache\SegmentCache;
-use SplitIO\Component\Cache\TrafficTypeCache;
 
 class KeyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/Suite/Component/TrafficTypeTests.php b/tests/Suite/Component/TrafficTypeTests.php
@@ -13,7 +13,7 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
                 'alert', 'notice', 'write', 'log'))
             ->getMock();
 
@@ -42,10 +42,11 @@ public function testTrafficTypeWarning()
 
         $this->assertEquals($keyTrafficType, 'SPLITIO.trafficType.abc');
 
-        $redisClient = ReflectiveTools::clientFromCachePool(Context::getCache());
+        $redisClient = ReflectiveTools::clientFromFactory($splitFactory);
+        $cachePool = ReflectiveTools::cacheFromFactory($splitFactory);
         $redisClient->del($keyTrafficType);
 
-        $splitCache = new SplitCache();
+        $splitCache = new SplitCache($cachePool);
 
         $this->assertEquals($splitCache->trafficTypeExists("abc"), false);
 
diff --git a/tests/Suite/DynamicConfigurations/EvaluatorTest.php b/tests/Suite/DynamicConfigurations/EvaluatorTest.php
@@ -4,7 +4,6 @@
 use SplitIO\Test\Suite\Redis\ReflectiveTools;
 use SplitIO\Component\Cache\SplitCache;
 use SplitIO\Component\Cache\SegmentCache;
-use SplitIO\Grammar\Split;
 use SplitIO\Sdk\Evaluator;
 
 class EvaluatorTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/Suite/Engine/SplitterTest.php b/tests/Suite/Engine/SplitterTest.php
@@ -2,13 +2,9 @@
 namespace SplitIO\Test\Suite\Engine;
 
 use SplitIO\Component\Initialization\LoggerFactory;
-use SplitIO\Component\Common\ServiceProvider;
-use SplitIO\Component\Log\LogLevelEnum;
 use SplitIO\Engine\Splitter;
 use SplitIO\Grammar\Condition\Partition;
 use SplitIO\Engine\Hash\HashAlgorithmEnum;
-use SplitIO\Grammar\Split;
-use SplitIO\Engine;
 use SplitIO\Component\Common\Context;
 
 class SplitterTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/Suite/InputValidation/FactoryTrackerTest.php b/tests/Suite/InputValidation/FactoryTrackerTest.php
@@ -11,8 +11,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/InputValidation/GetTreatmentValidationTest.php b/tests/Suite/InputValidation/GetTreatmentValidationTest.php
@@ -32,8 +32,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/InputValidation/GetTreatmentsValidationTest.php b/tests/Suite/InputValidation/GetTreatmentsValidationTest.php
@@ -32,8 +32,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/InputValidation/ManagerValidationTest.php b/tests/Suite/InputValidation/ManagerValidationTest.php
@@ -29,8 +29,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/InputValidation/TrackValidationTest.php b/tests/Suite/InputValidation/TrackValidationTest.php
@@ -32,8 +32,8 @@ private function getMockedLogger()
         $logger = $this
             ->getMockBuilder('\SplitIO\Component\Log\Logger')
             ->disableOriginalConstructor()
-            ->setMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
-                'alert', 'notice', 'write', 'log'))
+            ->onlyMethods(array('warning', 'debug', 'error', 'info', 'critical', 'emergency',
+                'alert', 'notice', 'log'))
             ->getMock();
 
         ReflectiveTools::overrideLogger($logger);
diff --git a/tests/Suite/Matchers/MatchersTest.php b/tests/Suite/Matchers/MatchersTest.php
diff --git a/tests/Suite/Redis/CacheInterfacesTest.php b/tests/Suite/Redis/CacheInterfacesTest.php
diff --git a/tests/Suite/Redis/ReflectiveTools.php b/tests/Suite/Redis/ReflectiveTools.php
diff --git a/tests/Suite/Redis/SafeRedisWrapperTest.php b/tests/Suite/Redis/SafeRedisWrapperTest.php
diff --git a/tests/Suite/Sdk/ImpressionWrapperTest.php b/tests/Suite/Sdk/ImpressionWrapperTest.php
diff --git a/tests/Suite/Sdk/SdkClientTest.php b/tests/Suite/Sdk/SdkClientTest.php
diff --git a/tests/Suite/Sdk/SdkReadOnlyTest.php b/tests/Suite/Sdk/SdkReadOnlyTest.php
diff --git a/tests/Suite/TrafficAllocation/TrafficAllocationTest.php b/tests/Suite/TrafficAllocation/TrafficAllocationTest.php

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private static function getSplitNameFromCacheKey($key)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @return long`
	`47`	`+ * @return int`
`48`	`48`	`*/`
`49`	`49`	`public function getChangeNumber()`
`50`	`50`	`{`
`@@ -64,7 +64,7 @@ public function getSplit($splitName)`
`64`	`64`
`65`	`65`	`/**`
`66`	`66`	`* @param array $splitNames`
`67`		`- * @return string JSON representation`
	`67`	`+ * @return array`
`68`	`68`	`*/`
`69`	`69`	`public function getSplits($splitNames)`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`interface SplitCacheInterface`
`5`	`5`	`{`
`6`	`6`	`/**`
`7`		`- * @return long`
	`7`	`+ * @return int`
`8`	`8`	`*/`
`9`	`9`	`public function getChangeNumber();`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class LoggerFactory`
`16`	`16`	`* Builds defaultLogger`
`17`	`17`	`*`
`18`	`18`	`* @param $options`
`19`		`- * @return SplitIO\Component\Log\Handler`
	`19`	`+ * @return \SplitIO\Component\Log\Handler\LogHandlerInterface`
`20`	`20`	`*/`
`21`	`21`	`private static function buildAdapter(array $options)`
`22`	`22`	`{`
`@@ -42,7 +42,7 @@ private static function buildAdapter(array $options)`
`42`	`42`	`* Builds logger`
`43`	`43`	`*`
`44`	`44`	`* @param $options`
`45`		`- * @return SplitIO\Component\Log\Logger`
	`45`	`+ * @return \SplitIO\Component\Log\Logger`
`46`	`46`	`*/`
`47`	`47`	`public static function setupLogger(array $options)`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class HashFactory`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* @param $algo`
`9`		`- * @return \SplitIO\Engine\HashInterface`
	`9`	`+ * @return \SplitIO\Engine\Hash\HashInterface`
`10`	`10`	`*/`
`11`	`11`	`public static function getHashAlgorithm($algo)`
`12`	`12`	`{`