fixed tests when OpenSsl is not enabled in PHP, renamed a missnamed t…

…est, added missing license doc blocks
symfony · Oct 28, 2012 · aecc9b1 · aecc9b1
1 parent ca567b5
commit aecc9b1
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/src/Symfony/Component/Security/Tests/Core/Util/ClassUtilsTest.php b/src/Symfony/Component/Security/Tests/Core/Util/ClassUtilsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Security\Tests\Core\Util
 {
     use Symfony\Component\Security\Core\Util\ClassUtils;

diff --git a/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php b/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Security\Tests\Core\Util;
 
 use Symfony\Component\Security\Core\Util\NullSeedProvider;
@@ -145,9 +154,14 @@ public function getSecureRandoms()
     {
         $secureRandoms = array();
 
-        // openssl with fallback
+        // openssl
         $secureRandom = new SecureRandom();
-        $secureRandoms[] = array($secureRandom);
+        // only add if openssl is indeed present
+        if ($this->hasOpenSsl($secureRandom)) {
+            $secureRandoms[] = array($secureRandom);
+        } else {
+            $this->markTestSkipped('OpenSSL is not available');
+        }
 
         // no-openssl with custom seed provider
         $secureRandom = new SecureRandom(sys_get_temp_dir().'/_sf2.seed');
@@ -162,6 +176,19 @@ protected function disableOpenSsl($secureRandom)
         $ref = new \ReflectionProperty($secureRandom, 'useOpenSsl');
         $ref->setAccessible(true);
         $ref->setValue($secureRandom, false);
+        $ref->setAccessible(false);
+    }
+
+    protected function hasOpenSsl($secureRandom)
+    {
+        $ref = new \ReflectionProperty($secureRandom, 'useOpenSsl');
+        $ref->setAccessible(true);
+
+        $ret = $ref->getValue($secureRandom);
+
+        $ref->setAccessible(false);
+
+        return $ret;
     }
 
     private function getBitSequence($secureRandom, $length)

diff --git a/...t/Security/Tests/Core/Util/StringTest.php → ...urity/Tests/Core/Util/StringUtilsTest.php b/...t/Security/Tests/Core/Util/StringTest.php → ...urity/Tests/Core/Util/StringUtilsTest.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Security\Tests\Core\Util;
 
 use Symfony\Component\Security\Core\Util\StringUtils;
 
-class StringTest extends \PHPUnit_Framework_TestCase
+class StringUtilsTest extends \PHPUnit_Framework_TestCase
 {
     public function testEquals()
     {