Merge branch 'hotfix/3046' into develop

Forward port zendframework/zendframework#3296
zendframework · Jan 3, 2013 · 3f1c2ef · 3f1c2ef
commit 3f1c2ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/Config/StandardConfig.php b/src/Config/StandardConfig.php
@@ -595,7 +595,7 @@ public function getUseCookies()
      */
     public function setEntropyFile($entropyFile)
     {
-        if (!is_file($entropyFile) || !is_readable($entropyFile)) {
+        if (!is_readable($entropyFile)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 "Invalid entropy_file provided: '%s'; doesn't exist or not readable",
                 $entropyFile

diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
@@ -460,12 +460,6 @@ public function testSetEntropyFileErrorsOnInvalidPath()
         $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
     }
 
-    public function testSetEntropyFileErrorsOnDirectory()
-    {
-        $this->setExpectedException('Zend\Session\Exception\InvalidArgumentException', 'Invalid entropy_file provided');
-        $this->config->setEntropyFile(__DIR__);
-    }
-
     public function testEntropyFileDefaultsToIniSettings()
     {
         $this->assertSame(ini_get('session.entropy_file'), $this->config->getEntropyFile());

diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
@@ -266,12 +266,6 @@ public function testSetEntropyFileErrorsOnInvalidPath()
         $this->config->setEntropyFile(__DIR__ . '/foobarboguspath');
     }
 
-    public function testSetEntropyFileErrorsOnDirectory()
-    {
-        $this->setExpectedException('Zend\Session\Exception\InvalidArgumentException', 'Invalid entropy_file provided');
-        $this->config->setEntropyFile(__DIR__);
-    }
-
     public function testEntropyFileIsMutable()
     {
         $this->config->setEntropyFile(__FILE__);
@@ -565,4 +559,20 @@ public function optionsProvider()
             ),
         );
     }
+
+    /**
+     * Set entropy file /dev/urandom, see issue #3046
+     *
+     * @link https://github.com/zendframework/zf2/issues/3046
+     */
+    public function testSetEntropyDevUrandom()
+    {
+        if (!file_exists('/dev/urandom')) {
+            $this->markTestSkipped(
+                "This test doesn't work because /dev/urandom file doesn't exist."
+            );
+        }
+        $result = $this->config->setEntropyFile('/dev/urandom');
+        $this->assertInstanceOf('Zend\Session\Config\StandardConfig', $result);
+    }
 }