Code review changes

rossmotley · rossmotley · commit 70cea86aed26 · 2018-04-05T18:06:32.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
@@ -25,10 +25,6 @@ class MigratingSessionHandler implements \SessionHandlerInterface
     private $currentHandler;
     private $writeOnlyHandler;
 
-    /**
-     * @param \SessionHandlerInterface $currentHandler
-     * @param \SessionHandlerInterface $writeOnlyHandler
-     */
     public function __construct(\SessionHandlerInterface $currentHandler, \SessionHandlerInterface $writeOnlyHandler)
     {
         $this->currentHandler = $currentHandler;
@@ -49,10 +45,10 @@ public function close()
     /**
      * {@inheritdoc}
      */
-    public function destroy($session_id)
+    public function destroy($sessionId)
     {
-        $result = $this->currentHandler->destroy($session_id);
-        $this->writeOnlyHandler->destroy($session_id);
+        $result = $this->currentHandler->destroy($sessionId);
+        $this->writeOnlyHandler->destroy($sessionId);
 
         return $result;
     }
@@ -71,32 +67,30 @@ public function gc($maxlifetime)
     /**
      * {@inheritdoc}
      */
-    public function open($save_path, $session_id)
+    public function open($savePath, $sessionId)
     {
-        $result = $this->currentHandler->open($save_path, $session_id);
-        $this->writeOnlyHandler->open($save_path, $session_id);
+        $result = $this->currentHandler->open($savePath, $sessionId);
+        $this->writeOnlyHandler->open($savePath, $sessionId);
 
         return $result;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function read($session_id)
+    public function read($sessionId)
     {
         // No reading from new handler until switch-over
-        $result = $this->currentHandler->read($session_id);
-
-        return $result;
+        return $this->currentHandler->read($sessionId);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function write($session_id, $session_data)
+    public function write($sessionId, $sessionData)
     {
-        $result = $this->currentHandler->write($session_id, $session_data);
-        $this->writeOnlyHandler->write($session_id, $session_data);
+        $result = $this->currentHandler->write($sessionId, $sessionData);
+        $this->writeOnlyHandler->write($sessionId, $sessionData);
 
         return $result;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php
@@ -20,15 +20,10 @@ class MigratingSessionHandlerTest extends TestCase
     private $currentHandler;
     private $writeOnlyHandler;
 
-    public function setUp()
+    protected function setUp()
     {
-        $this->currentHandler = $this->getMockBuilder(\SessionHandlerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->writeOnlyHandler = $this->getMockBuilder(\SessionHandlerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->currentHandler = $this->createMock(\SessionHandlerInterface::class);
+        $this->writeOnlyHandler = $this->createMock(\SessionHandlerInterface::class);
 
         $this->dualHandler = new MigratingSessionHandler($this->currentHandler, $this->writeOnlyHandler);
     }
@@ -127,7 +122,7 @@ public function testReads()
     public function testWrites()
     {
         $sessionId = 'xyz';
-        $data = array('zfa' => 'hwq');
+        $data = 'my-serialized-data';
 
         $this->currentHandler->expects($this->once())
             ->method('write')
