Set default salt in generate() call removing the need for an exception.

Bilge · Bilge · commit 4af19fb4e11c · 2012-10-04T23:26:27.000+01:00
diff --git a/lib/Doctrine/ODM/MongoDB/Id/UuidGenerator.php b/lib/Doctrine/ODM/MongoDB/Id/UuidGenerator.php
@@ -54,7 +54,6 @@ public function setSalt($salt)
      */
     public function getSalt()
     {
-        if (!isset($this->salt)) $this->setSalt(php_uname('n'));
         return $this->salt;
     }
 
@@ -76,12 +75,8 @@ public function isValid($guid)
      */
     public function generate(DocumentManager $dm, $document)
     {
-        if (!$this->salt) {
-            throw new \Exception('Guid Generator requires a salt to be provided.');
-        }
-
         $guid = $this->generateV4();
-        return $this->generateV5($guid, $this->salt);
+        return $this->generateV5($guid, $this->salt ?: php_uname('n'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public function setSalt($salt)`
`54`	`54`	`*/`
`55`	`55`	`public function getSalt()`
`56`	`56`	`{`
`57`		`- if (!isset($this->salt)) $this->setSalt(php_uname('n'));`
`58`	`57`	`return $this->salt;`
`59`	`58`	`}`
`60`	`59`
`@@ -76,12 +75,8 @@ public function isValid($guid)`
`76`	`75`	`*/`
`77`	`76`	`public function generate(DocumentManager $dm, $document)`
`78`	`77`	`{`
`79`		`- if (!$this->salt) {`
`80`		`- throw new \Exception('Guid Generator requires a salt to be provided.');`
`81`		`- }`
`82`		`-`
`83`	`78`	`$guid = $this->generateV4();`
`84`		`- return $this->generateV5($guid, $this->salt);`
	`79`	`+ return $this->generateV5($guid, $this->salt ?: php_uname('n'));`
`85`	`80`	`}`
`86`	`81`
`87`	`82`	`/**`