fixes jackalope/jackalope-doctrine-dbal#298

added ramsey/uuid generator

Author: takeit

composer.json

@@ -29,7 +29,8 @@
     "require": {
         "php": ">=5.3.3",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "~2.3|~3.0"
+        "symfony/console": "~2.3|~3.0",
+        "ramsey/uuid": "~2.8"
     },
     "conflict": {
         "jackalope/jackalope-jackrabbit": "<1.2.1"

src/PHPCR/Util/UUIDHelper.php

@@ -2,6 +2,8 @@
 
 namespace PHPCR\Util;
 
+use Rhumsaa\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)
     {
@@ -29,31 +32,12 @@ public static function isUUID($id)
     /**
      * Generate a UUID.
      *
-     * This UUID can not be guaranteed to be unique within the repository.
-     * Ensuring this is the responsibility of the repository implementation.
-     *
      * @return string a random UUID
      */
     public static function generateUUID()
     {
-        return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
-
-            // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
-
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
-
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+        $uuid4 = Uuid::uuid4();
 
-            // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
-        );
+        return $uuid4->toString();
     }
 }