Merge branch 'master' of github.com:yiisoft/yii2

docs/guide/controller.md

@@ -50,6 +50,9 @@ If controller is located inside a module its action internal route will be `modu
 
 In case module, controller or action specified isn't found Yii will return "not found" page and HTTP status code 404.
 
+> Note: If controller name or action name contains camelCased words, internal route will use dashes i.e. for
+`DateTimeController::actionFastForward` route will be `date-time/fast-forward`.
+
 ### Defaults
 
 If user isn't specifying any route i.e. using URL like `http://example.com/`, Yii assumes that default route should be

framework/yii/requirements/requirements.php

@@ -41,7 +41,7 @@ return array(
 	array(
 		'name' => 'Intl extension',
 		'mandatory' => false,
-		'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2'),
+		'condition' => $this->checkPhpExtensionVersion('intl', '1.0.2', '>='),
 		'by' => '<a href="http://www.php.net/manual/en/book.intl.php">Internationalization</a> support',
 		'memo' => 'PHP Intl extension 1.0.2 or higher is required when you want to use <abbr title="Internationalized domain names">IDN</abbr>-feature of EmailValidator or UrlValidator or the <code>yii\i18n\Formatter</code> class.'
 	),

framework/yii/web/CaptchaAction.php

@@ -189,15 +189,15 @@ class CaptchaAction extends Action
 	 */
 	protected function generateVerifyCode()
 	{
+		if ($this->minLength > $this->maxLength) {
+			$this->maxLength = $this->minLength;
+		}
 		if ($this->minLength < 3) {
 			$this->minLength = 3;
 		}
 		if ($this->maxLength > 20) {
 			$this->maxLength = 20;
 		}
-		if ($this->minLength > $this->maxLength) {
-			$this->maxLength = $this->minLength;
-		}
 		$length = mt_rand($this->minLength, $this->maxLength);
 
 		$letters = 'bcdfghjklmnpqrstvwxyz';