Merge pull request #697 from DavertMik/patch-1

A simple patch to get AspectMock and Go Aop working with Yii2

Merge pull request #697 from DavertMik/patch-1
92d3c98c · Alexander Makarov · a23f2334 · 7f2d2da5 · 92d3c98c
Commit 92d3c98c authored Jul 31, 2013 by Alexander Makarov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

SecurityBase.php framework/yii/helpers/SecurityBase.php +4 -1

No files found.
--- a/framework/yii/helpers/SecurityBase.php
+++ b/framework/yii/helpers/SecurityBase.php
@@ -120,7 +120,10 @@ class SecurityBase
 		static $keys;
 		$keyFile = Yii::$app->getRuntimePath() . '/keys.php';
 		if ($keys === null) {
-			$keys = is_file($keyFile) ? require($keyFile) : array();
+			$keys = array();
+			if (is_file($keyFile)) {
+				$keys = require($keyFile);
+			}
 		}
 		if (!isset($keys[$name])) {
 			$keys[$name] = static::generateRandomKey($length);