Merge pull request #159 from takeit/master

fixes jackalope/jackalope-doctrine-dbal#298

Author: dbu

README.md

@@ -66,6 +66,11 @@ valid UUID.
 We recommend all implementations to use this implementation to guarantee
 consistent behaviour.
 
+**Note**
+
+You can use [ramsey/uuid](https://github.com/ramsey/uuid) library to generate UUIDs. In this case,
+install it using Composer and generating UUIDs will be taken over by `ramsey/uuid`.
+
 ### QOM QueryBuilder
 
 The ``QueryBuilder`` is a fluent query builder with method names matching the

composer.json

@@ -31,6 +31,9 @@
         "phpcr/phpcr": "~2.1.0",
         "symfony/console": "~2.3|~3.0"
     },
+    "suggest": {
+        "ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
+    },
     "conflict": {
         "jackalope/jackalope-jackrabbit": "<1.2.1"
     },

src/PHPCR/Util/UUIDHelper.php

@@ -2,6 +2,8 @@
 
 namespace PHPCR\Util;
 
+use Ramsey\Uuid\Uuid;
+
 /**
  * Static helper functions to deal with Universally Unique IDs (UUID).
  *
@@ -13,8 +15,9 @@ class UUIDHelper
     /**
      * Checks if the string could be a UUID.
      *
-     * @param  string  $id Possible uuid
-     * @return boolean True if the test was passed, else false.
+     * @param string $id Possible uuid
+     *
+     * @return bool True if the test was passed, else false.
      */
     public static function isUUID($id)
     {
@@ -32,10 +35,18 @@ public static function isUUID($id)
      * This UUID can not be guaranteed to be unique within the repository.
      * Ensuring this is the responsibility of the repository implementation.
      *
+     * It also allows the use of Ramsey\Uuid\Uuid class.
+     *
      * @return string a random UUID
      */
     public static function generateUUID()
     {
+        if (class_exists('Ramsey\Uuid\Uuid')) {
+            $uuid4 = Uuid::uuid4();
+
+            return $uuid4->toString();
+        }
+
         return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
             // 32 bits for "time_low"
             mt_rand(0, 0xffff), mt_rand(0, 0xffff),