Merge pull request #348 from coder-pm/dev-session-handler-shutdown

Seldaek · web-flow · commit 8e8ec5194a28 · 2018-04-06T16:24:57.000+02:00
Session handler shutdown cleanup
diff --git a/Session/Storage/Handler/RedisSessionHandler.php b/Session/Storage/Handler/RedisSessionHandler.php
@@ -75,9 +75,11 @@ class RedisSessionHandler implements \SessionHandlerInterface
     /**
      * Redis session storage constructor.
      *
-     * @param \Predis\Client|\Redis $redis   Redis database connection
-     * @param array                 $options Session options
-     * @param string                $prefix  Prefix to use when writing session data
+     * @param \Predis\Client|\Redis $redis          Redis database connection
+     * @param array                 $options        Session options
+     * @param string                $prefix         Prefix to use when writing session data
+     * @param bool                  $locking        Indicates an sessions should be locked
+     * @param int                   $spinLockWait   Microseconds to wait between acquire lock tries
      */
     public function __construct($redis, array $options = array(), $prefix = 'session', $locking = true, $spinLockWait = 150000)
     {
@@ -96,6 +98,8 @@ public function __construct($redis, array $options = array(), $prefix = 'session
         if (!$this->lockMaxWait) {
             $this->lockMaxWait = self::DEFAULT_MAX_EXECUTION_TIME;
         }
+
+        register_shutdown_function(array($this, 'shutdown'));
     }
 
     /**
@@ -264,10 +268,9 @@ protected function getRedisKey($key)
     }
 
     /**
-     * Destructor.
+     * Shutdown handler, replacement for class destructor as it might not be called.
      */
-    public function __destruct()
-    {
+    public function shutdown() {
         $this->close();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,11 @@ class RedisSessionHandler implements \SessionHandlerInterface`
`75`	`75`	`/**`
`76`	`76`	`* Redis session storage constructor.`
`77`	`77`	`*`
`78`		`- * @param \Predis\Client\|\Redis $redis Redis database connection`
`79`		`- * @param array $options Session options`
`80`		`- * @param string $prefix Prefix to use when writing session data`
	`78`	`+ * @param \Predis\Client\|\Redis $redis Redis database connection`
	`79`	`+ * @param array $options Session options`
	`80`	`+ * @param string $prefix Prefix to use when writing session data`
	`81`	`+ * @param bool $locking Indicates an sessions should be locked`
	`82`	`+ * @param int $spinLockWait Microseconds to wait between acquire lock tries`
`81`	`83`	`*/`
`82`	`84`	`public function __construct($redis, array $options = array(), $prefix = 'session', $locking = true, $spinLockWait = 150000)`
`83`	`85`	`{`
`@@ -96,6 +98,8 @@ public function __construct($redis, array $options = array(), $prefix = 'session`
`96`	`98`	`if (!$this->lockMaxWait) {`
`97`	`99`	`$this->lockMaxWait = self::DEFAULT_MAX_EXECUTION_TIME;`
`98`	`100`	`}`
	`101`	`+`
	`102`	`+ register_shutdown_function(array($this, 'shutdown'));`
`99`	`103`	`}`
`100`	`104`
`101`	`105`	`/**`
`@@ -264,10 +268,9 @@ protected function getRedisKey($key)`
`264`	`268`	`}`
`265`	`269`
`266`	`270`	`/**`
`267`		`- * Destructor.`
	`271`	`+ * Shutdown handler, replacement for class destructor as it might not be called.`
`268`	`272`	`*/`
`269`		`- public function __destruct()`
`270`		`- {`
	`273`	`+ public function shutdown() {`
`271`	`274`	`$this->close();`
`272`	`275`	`}`
`273`	`276`	`}`