diff --git a/src/User/Service/SessionHistory/SessionHistoryDecorator.php b/src/User/Service/SessionHistory/SessionHistoryDecorator.php
index ebe416b6..177bae99 100755
--- a/src/User/Service/SessionHistory/SessionHistoryDecorator.php
+++ b/src/User/Service/SessionHistory/SessionHistoryDecorator.php
@@ -73,9 +73,9 @@ public function getHasSessionId()
     }
 
     /** @inheritdoc */
-    public function setHasSessionId($value)
+    public function setHasSessionId($value) : void
     {
-        return $this->session->setHasSessionId($value);
+        $this->session->setHasSessionId($value);
     }
 
     /** @inheritdoc */
@@ -85,9 +85,9 @@ public function getId()
     }
 
     /** @inheritdoc */
-    public function setId($value)
+    public function setId($value) : void
     {
-        return $this->session->setId($value);
+        $this->session->setId($value);
     }
 
     /** @inheritdoc */
@@ -125,9 +125,9 @@ public function getName()
     }
 
     /** @inheritdoc */
-    public function setName($value)
+    public function setName($value) : void
     {
-        return $this->session->setName($value);
+        $this->session->setName($value);
     }
 
     /** @inheritdoc */
@@ -137,9 +137,9 @@ public function getSavePath()
     }
 
     /** @inheritdoc */
-    public function setSavePath($value)
+    public function setSavePath($value) : void
     {
-        return $this->session->setSavePath($value);
+        $this->session->setSavePath($value);
     }
 
     /** @inheritdoc */
@@ -149,9 +149,9 @@ public function getCookieParams()
     }
 
     /** @inheritdoc */
-    public function setCookieParams(array $value)
+    public function setCookieParams(array $value) : void
     {
-        return $this->session->setCookieParams($value);
+        $this->session->setCookieParams($value);
     }
 
     /** @inheritdoc */
@@ -161,9 +161,9 @@ public function getUseCookies()
     }
 
     /** @inheritdoc */
-    public function setUseCookies($value)
+    public function setUseCookies($value) : void
     {
-        return $this->session->setUseCookies($value);
+        $this->session->setUseCookies($value);
     }
 
     /** @inheritdoc */
@@ -173,9 +173,9 @@ public function getGCProbability()
     }
 
     /** @inheritdoc */
-    public function setGCProbability($value)
+    public function setGCProbability($value) : void
     {
-        return $this->session->setGCProbability($value);
+        $this->session->setGCProbability($value);
     }
 
     /** @inheritdoc */
@@ -185,9 +185,9 @@ public function getUseTransparentSessionID()
     }
 
     /** @inheritdoc */
-    public function setUseTransparentSessionID($value)
+    public function setUseTransparentSessionID($value) : void
     {
-        return $this->session->setUseTransparentSessionID($value);
+        $this->session->setUseTransparentSessionID($value);
     }
 
     /** @inheritdoc */
@@ -197,9 +197,9 @@ public function getTimeout()
     }
 
     /** @inheritdoc */
-    public function setTimeout($value)
+    public function setTimeout($value) : void
     {
-        return $this->session->setTimeout($value);
+        $this->session->setTimeout($value);
     }
 
     /** @inheritdoc */
@@ -313,9 +313,9 @@ public function remove($key)
     }
 
     /** @inheritdoc */
-    public function removeAll()
+    public function removeAll() : void
     {
-        return $this->session->removeAll();
+        $this->session->removeAll();
     }
 
     /** @inheritdoc */
@@ -337,15 +337,15 @@ public function getAllFlashes($delete = false)
     }
 
     /** @inheritdoc */
-    public function setFlash($key, $value = true, $removeAfterAccess = true)
+    public function setFlash($key, $value = true, $removeAfterAccess = true) : void
     {
-        return $this->session->setFlash($key, $value, $removeAfterAccess);
+        $this->session->setFlash($key, $value, $removeAfterAccess);
     }
 
     /** @inheritdoc */
-    public function addFlash($key, $value = true, $removeAfterAccess = true)
+    public function addFlash($key, $value = true, $removeAfterAccess = true) : void
     {
-        return $this->session->addFlash($key, $value, $removeAfterAccess);
+        $this->session->addFlash($key, $value, $removeAfterAccess);
     }
 
     /** @inheritdoc */
@@ -355,9 +355,9 @@ public function removeFlash($key)
     }
 
     /** @inheritdoc */
-    public function removeAllFlashes()
+    public function removeAllFlashes() : void
     {
-        return $this->session->removeAllFlashes();
+        $this->session->removeAllFlashes();
     }
 
     /** @inheritdoc */
diff --git a/src/User/Validator/TwoFactorEmailValidator.php b/src/User/Validator/TwoFactorEmailValidator.php
index a45c723d..41559e72 100644
--- a/src/User/Validator/TwoFactorEmailValidator.php
+++ b/src/User/Validator/TwoFactorEmailValidator.php
@@ -38,9 +38,7 @@ class TwoFactorEmailValidator extends TwoFactorCodeValidator
      */
     public function __construct(User $user, $code, $cycles = 0)
     {
-        $this->user = $user;
-        $this->code = $code;
-        $this->cycles = $cycles;
+        parent::__construct($user, $code, $cycles);
         $this->type = 'email';
     }
 
diff --git a/src/User/Validator/TwoFactorTextMessageValidator.php b/src/User/Validator/TwoFactorTextMessageValidator.php
index 1770229c..f199e592 100644
--- a/src/User/Validator/TwoFactorTextMessageValidator.php
+++ b/src/User/Validator/TwoFactorTextMessageValidator.php
@@ -38,10 +38,7 @@ class TwoFactorTextMessageValidator extends TwoFactorCodeValidator
      */
     public function __construct(User $user, $code, $cycles = 0)
     {
-        $this->user = $user;
-
-        $this->code = $code;
-        $this->cycles = $cycles;
+        parent::__construct($user, $code, $cycles);
         $this->type = 'sms';
     }