Merge pull request #1121 from mongosoft/master

framework/yii/db/ActiveRecord.php

@@ -1266,6 +1266,8 @@ class ActiveRecord extends Model
 			$relation = $this->$getter();
 			if ($relation instanceof ActiveRelation) {
 				return $relation;
+			} else {
+				return null;
 			}
 		} catch (UnknownMethodException $e) {
 			throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e);

framework/yii/db/mssql/Schema.php

@@ -118,6 +118,8 @@ class Schema extends \yii\db\Schema
 		if ($this->findColumns($table)) {
 			$this->findForeignKeys($table);
 			return $table;
+		} else {
+			return null;
 		}
 	}
 

framework/yii/i18n/GettextMoFile.php

@@ -203,6 +203,8 @@ class GettextMoFile extends GettextFile
 	{
 		if ($byteCount > 0) {
 			return fread($fileHandle, $byteCount);
+		} else {
+			return null;
 		}
 	}