[HttpFoundation] Add RedisSessionHandler (coding style)

dkarlovi · dkarlovi · commit 3bfac1a097cc · 2017-12-15T14:43:50.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -29,7 +29,7 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
     protected $storage;
 
     /**
-     * @var \Redis|\RedisArray|\RedisCluster|\Predis\Client|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Redis|\RedisArray|\RedisCluster|\Predis\Client
      */
     protected $redisClient;
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -11,15 +11,12 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use Predis\Client;
+
 class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    /**
-     * @return \Predis\Client
-     */
-    protected function createRedisClient(string $host): \Predis\Client
+    protected function createRedisClient(string $host): Client
     {
-        $redis = new \Predis\Client(array(\compact('host')));
-
-        return $redis;
+        return  new Client(array(\compact('host')));
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
@@ -11,15 +11,12 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use Predis\Client;
+
 class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    /**
-     * @return \Predis\Client
-     */
-    protected function createRedisClient(string $host): \Predis\Client
+    protected function createRedisClient(string $host): Client
     {
-        $redis = new \Predis\Client(\compact('host'));
-
-        return $redis;
+        return new Client(\compact('host'));
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
@@ -13,13 +13,8 @@
 
 class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    /**
-     * @return \RedisArray
-     */
     protected function createRedisClient(string $host): \RedisArray
     {
-        $redis = new \RedisArray(array($host));
-
-        return $redis;
+        return new \RedisArray(array($host));
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -13,9 +13,6 @@
 
 class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    /**
-     * @return \Redis
-     */
     protected function createRedisClient(string $host): \Redis
     {
         $client = new \Redis();

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;`
`13`	`13`
	`14`	`+use Predis\Client;`
	`15`	`+`
`14`	`16`	`class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`15`	`17`	`{`
`16`		`- /**`
`17`		`- * @return \Predis\Client`
`18`		`- */`
`19`		`- protected function createRedisClient(string $host): \Predis\Client`
	`18`	`+ protected function createRedisClient(string $host): Client`
`20`	`19`	`{`
`21`		`- $redis = new \Predis\Client(array(\compact('host')));`
`22`		`-`
`23`		`- return $redis;`
	`20`	`+ return new Client(array(\compact('host')));`
`24`	`21`	`}`
`25`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,8 @@`
`13`	`13`
`14`	`14`	`class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * @return \RedisArray`
`18`		`- */`
`19`	`16`	`protected function createRedisClient(string $host): \RedisArray`
`20`	`17`	`{`
`21`		`- $redis = new \RedisArray(array($host));`
`22`		`-`
`23`		`- return $redis;`
	`18`	`+ return new \RedisArray(array($host));`
`24`	`19`	`}`
`25`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`
`14`	`14`	`class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * @return \Redis`
`18`		`- */`
`19`	`16`	`protected function createRedisClient(string $host): \Redis`
`20`	`17`	`{`
`21`	`18`	`$client = new \Redis();`