Merge branch 'master' of git.yiisoft.com:yii2

docs/code_style.md

@@ -227,6 +227,7 @@ switch ($this->phpType) {
 		$a = (string)$value;
 		break;
 	case 'integer':
+	case 'int':
 		$a = (integer)$value;
 		break;
 	case 'boolean':
@@ -234,12 +235,9 @@ switch ($this->phpType) {
 		break;
 	default:
 		$a = null;
-	break;
 }
 ~~~
 
-Do not omit `break`.
-
 ### Code documentation
 
 - Refer ot [phpDoc](http://phpdoc.org/) for documentation syntax.