Md5 and prefixed generator, generator must return not empty string

Author: snapshotpl

src/Exception/InvalidRequestId.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Exception;
+
+class InvalidRequestId extends \UnexpectedValueException
+{
+
+}

src/Generator/GeneratorInterface.php

@@ -5,7 +5,7 @@
 interface GeneratorInterface
 {
     /**
-     * @return mixed unique value
+     * @return string unique value
      */
     public function generateRequestId();
 }

src/Generator/Md5Generator.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+final class Md5Generator implements GeneratorInterface
+{
+    private $generator;
+
+    public function __construct(GeneratorInterface $generator)
+    {
+        $this->generator = $generator;
+    }
+
+    public function generateRequestId()
+    {
+        return md5($this->generator->generateRequestId());
+    }
+}

src/Generator/PhpUniqidGenerator.php

@@ -27,7 +27,7 @@ public function __construct($prefix = '', $moreEntropy = false)
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function generateRequestId()
     {

src/Generator/PrefixedGenerator.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+final class PrefixedGenerator implements GeneratorInterface
+{
+    private $prefix;
+    private $generator;
+
+    /**
+     * @param string $prefix
+     * @param GeneratorInterface $generator
+     */
+    public function __construct($prefix, GeneratorInterface $generator)
+    {
+        $this->prefix = (string) $prefix;
+        $this->generator = $generator;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateRequestId()
+    {
+        return $this->prefix . $this->generator->generateRequestId();
+    }
+}

src/Generator/RhumsaaUuid1Generator.php

@@ -36,7 +36,7 @@ public function __construct($node = null, $clockSeq = null)
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function generateRequestId()
     {

src/Generator/RhumsaaUuid3Generator.php

@@ -30,7 +30,7 @@ public function __construct($ns, $name)
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function generateRequestId()
     {

src/Generator/RhumsaaUuid4Generator.php

@@ -7,7 +7,7 @@
 final class RhumsaaUuid4Generator implements GeneratorInterface
 {
     /**
-     * @return mixed
+     * @return string
      */
     public function generateRequestId()
     {

src/Generator/RhumsaaUuid5Generator.php

@@ -30,7 +30,7 @@ public function __construct($ns, $name)
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function generateRequestId()
     {

src/RequestIdMiddleware.php

@@ -109,7 +109,10 @@ protected function getRequestIdFromRequest(ServerRequestInterface $request)
             $requestId = $this->generator->generateRequestId();
 
             if (empty($requestId)) {
-                throw new Exception\NotGenerated('Generator return empty value');
+                throw new Exception\InvalidRequestId('Generator return empty value');
+            }
+            if (!is_string($requestId)) {
+                throw new Exception\InvalidRequestId('Request id is not a string');
             }
         }
         return $requestId;