Moved the test to the factory

Author: im-bryan

src/RedisSimpleLockFactory.php

@@ -12,12 +12,14 @@ class RedisSimpleLockFactory implements TtlFactory
     private $client;
     private $defaultTtl;
     private $logger;
+    private $ignoredSapis;
 
-    public function __construct(Client $client, $defaultTtl = 10000, LoggerInterface $logger = null)
+    public function __construct(Client $client, $defaultTtl = 10000, LoggerInterface $logger = null, array $ignoredSapis = [])
     {
-        $this->client     = $client;
-        $this->defaultTtl = $defaultTtl;
-        $this->logger     = $logger ?: new NullLogger;
+        $this->client       = $client;
+        $this->defaultTtl   = $defaultTtl;
+        $this->logger       = $logger ?: new NullLogger;
+        $this->ignoredSapis = $ignoredSapis;
     }
 
     /**
@@ -30,6 +32,6 @@ public function __construct(Client $client, $defaultTtl = 10000, LoggerInterface
      */
     public function create($identifier, $ttl = null)
     {
-        return new RedisSimpleLock($identifier, $this->client, $ttl ?: $this->defaultTtl, $this->logger);
+        return new RedisSimpleLock($identifier, $this->client, $ttl ?: $this->defaultTtl, $this->logger, $this->ignoredSapis);
     }
 }

tests/RedisSimpleLockFactoryTest.php

@@ -13,10 +13,23 @@ protected function setUp()
         $this->redisClient->flushdb();
     }
 
+    public function testCreateIgnoredSapisLock()
+    {
+        $factory = new RedisSimpleLockFactory($this->redisClient, 50, null, [php_sapi_name()]);
+        $lock = $factory->create('lock identifier');
+        $this->assertInstanceOf(RedisSimpleLock::class, $lock);
+
+        $handler = pcntl_signal_get_handler(SIGINT);
+        $this->assertEmpty($handler);
+    }
+
     public function testCreateLock()
     {
         $factory = new RedisSimpleLockFactory($this->redisClient, 50);
         $lock = $factory->create('lock identifier');
         $this->assertInstanceOf(RedisSimpleLock::class, $lock);
+
+        $handler = pcntl_signal_get_handler(SIGINT);
+        $this->assertInstanceOf(Closure::class, $handler);
     }
 }

tests/RedisSimpleLockTest.php

@@ -11,18 +11,7 @@ protected function setUp()
         $this->redisClient = new \Predis\Client(getenv("REDIS_URI"));
         $this->redisClient->flushdb();
     }
-
-    public function testSAPIIgnore()
-    {
-        $lock1 = new RedisSimpleLock("lock identifier", $this->redisClient, 50, null, [php_sapi_name()]);
-        $handler = pcntl_signal_get_handler(SIGINT);
-        $this->assertEmpty($handler);
-
-        $lock2 = new RedisSimpleLock("lock identifier", $this->redisClient, 50, null);
-        $handler = pcntl_signal_get_handler(SIGINT);
-        $this->assertInstanceOf(Closure::class, $handler);
-    }
-
+    
     public function testLock()
     {
         $lock1 = new RedisSimpleLock("lock identifier", $this->redisClient, 50);