[Security] fixed tests when OpenSSL is not installed

fabpot · fabpot · commit 1f1beb1ceb46 · 2012-10-28T09:01:53.000+01:00
diff --git a/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php b/src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php
@@ -154,13 +154,10 @@ public function getSecureRandoms()
     {
         $secureRandoms = array();
 
-        // openssl
-        $secureRandom = new SecureRandom();
         // only add if openssl is indeed present
+        $secureRandom = new SecureRandom();
         if ($this->hasOpenSsl($secureRandom)) {
             $secureRandoms[] = array($secureRandom);
-        } else {
-            $this->markTestSkipped('OpenSSL is not available');
         }
 
         // no-openssl with custom seed provider
diff --git a/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -319,7 +319,7 @@ protected function getService($userProvider = null, $options = array(), $logger
             $userProvider = $this->getProvider();
         }
 
-        return new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger, new SecureRandom());
+        return new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger, new SecureRandom(sys_get_temp_dir().'/_sf2.seed'));
     }
 
     protected function getProvider()

Original file line number	Diff line number	Diff line change
`@@ -154,13 +154,10 @@ public function getSecureRandoms()`
`154`	`154`	`{`
`155`	`155`	`$secureRandoms = array();`
`156`	`156`
`157`		`- // openssl`
`158`		`- $secureRandom = new SecureRandom();`
`159`	`157`	`// only add if openssl is indeed present`
	`158`	`+ $secureRandom = new SecureRandom();`
`160`	`159`	`if ($this->hasOpenSsl($secureRandom)) {`
`161`	`160`	`$secureRandoms[] = array($secureRandom);`
`162`		`- } else {`
`163`		`- $this->markTestSkipped('OpenSSL is not available');`
`164`	`161`	`}`
`165`	`162`
`166`	`163`	`// no-openssl with custom seed provider`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ protected function getService($userProvider = null, $options = array(), $logger`
`319`	`319`	`$userProvider = $this->getProvider();`
`320`	`320`	`}`
`321`	`321`
`322`		`- return new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger, new SecureRandom());`
	`322`	`+ return new PersistentTokenBasedRememberMeServices(array($userProvider), 'fookey', 'fookey', $options, $logger, new SecureRandom(sys_get_temp_dir().'/_sf2.seed'));`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`protected function getProvider()`