Update ramsey/uuid to 3.*

Author: snapshotpl

README.md

@@ -54,21 +54,33 @@ To generate request id you need to use implementation of `PhpMiddleware\RequestI
 
 Simple generator using [uniqid](http://php.net/manual/en/function.uniqid.php) function.
 
-#### `RhumsaaUuid1Generator`
+#### `RamseyUuid1Generator`
 
-[UUID](https://tools.ietf.org/html/rfc4122)1 implementations of [Rhumsaa\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
+[UUID](https://tools.ietf.org/html/rfc4122)1 implementations of [Ramsey\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
 
-#### `RhumsaaUuid3Generator`
+#### `RamseyUuid3Generator`
 
-[UUID](https://tools.ietf.org/html/rfc4122)3 implementations of [Rhumsaa\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
+[UUID](https://tools.ietf.org/html/rfc4122)3 implementations of [Ramsey\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
 
-#### `RhumsaaUuid4Generator`
+#### `RamseyUuid4Generator`
 
-[UUID](https://tools.ietf.org/html/rfc4122)4 implementations of [Rhumsaa\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
+[UUID](https://tools.ietf.org/html/rfc4122)4 implementations of [Ramsey\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
 
-#### `RhumsaaUuid5Generator`
+#### `RamseyUuid4StaticGenerator`
 
-[UUID](https://tools.ietf.org/html/rfc4122)5 implementations of [Rhumsaa\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
+Generates Uuid4 like `RamseyUuid4Generator` however it's not require any dependency (it use static factory method).
+
+#### `RamseyUuid5Generator`
+
+[UUID](https://tools.ietf.org/html/rfc4122)5 implementations of [Ramsey\Uuid](https://github.com/ramsey/uuid). To use it you need to add `ramsey/uuid` dependency to your `composer.json`.
+
+#### `PrefixedGenerator`
+
+Adds prefix to generated request id.
+
+#### `Md5Generator`
+
+This generator converts generated request id to md5 hash.
 
 ## It's just works with any modern php framework!
 

composer.json

@@ -14,11 +14,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.6",
-        "ramsey/uuid": "^2.8",
+        "ramsey/uuid": "^3.0",
         "zendframework/zend-diactoros": "^1.1.3"
     },
     "suggest": {
-        "ramsey/uuid": "To use Rhumsaa\\Uuid generator"
+        "ramsey/uuid": "To use Ramsey\\Uuid 3.0 generator"
     },
     "autoload": {
         "psr-4": {

src/Generator/RamseyUuid1Generator.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+use Ramsey\Uuid\UuidFactoryInterface;
+
+final class RamseyUuid1Generator implements GeneratorInterface
+{
+    private $node;
+
+    private $clockSeq;
+
+    private $factory;
+
+    /**
+     * @param UuidFactoryInterface $factory
+     * @param int|string $node
+     * @param int $clockSeq
+     */
+    public function __construct(UuidFactoryInterface $factory, $node = null, $clockSeq = null)
+    {
+        $this->factory = $factory;
+        $this->node = $node;
+        $this->clockSeq = $clockSeq;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateRequestId()
+    {
+        return $this->factory->uuid1($this->node, $this->clockSeq)->toString();
+    }
+}

src/Generator/RamseyUuid3Generator.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+use Ramsey\Uuid\UuidFactoryInterface;
+
+final class RamseyUuid3Generator implements GeneratorInterface
+{
+    private $ns;
+
+    private $name;
+
+    private $factory;
+
+    /**
+     * @param UuidFactoryInterface $factory
+     * @param string $ns
+     * @param string $name
+     */
+    public function __construct(UuidFactoryInterface $factory, $ns, $name)
+    {
+        $this->factory = $factory;
+        $this->ns = $ns;
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateRequestId()
+    {
+        return $this->factory->uuid3($this->ns, $this->name)->toString();
+    }
+}

src/Generator/RamseyUuid4Generator.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+use Ramsey\Uuid\UuidFactoryInterface;
+
+final class RamseyUuid4Generator implements GeneratorInterface
+{
+    private $factory;
+
+    public function __construct(UuidFactoryInterface $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateRequestId()
+    {
+        return $this->factory->uuid4()->toString();
+    }
+}

src/Generator/RhumsaaUuid4Generator.php renamed to src/Generator/RamseyUuid4StaticGenerator.php

@@ -2,15 +2,15 @@
 
 namespace PhpMiddleware\RequestId\Generator;
 
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Uuid;
 
-final class RhumsaaUuid4Generator implements GeneratorInterface
+final class RamseyUuid4StaticGenerator implements GeneratorInterface
 {
     /**
      * @return string
      */
     public function generateRequestId()
     {
-        return (string) Uuid::uuid4();
+        return Uuid::uuid4()->toString();
     }
 }

src/Generator/RamseyUuid5Generator.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpMiddleware\RequestId\Generator;
+
+use Ramsey\Uuid\UuidFactoryInterface;
+
+final class RamseyUuid5Generator implements GeneratorInterface
+{
+    private $ns;
+
+    private $name;
+
+    private $factory;
+
+    /**
+     * @param UuidFactoryInterface $factory
+     * @param string $ns
+     * @param string $name
+     */
+    public function __construct(UuidFactoryInterface $factory, $ns, $name)
+    {
+        $this->factory = $factory;
+        $this->ns = $ns;
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateRequestId()
+    {
+        return $this->factory->uuid5($this->ns, $this->name)->toString();
+    }
+}