removed needFix method

yiisoft · Oct 16, 2013 · bf7a084 · bf7a084
1 parent da8f179
commit bf7a084
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/framework/yii/i18n/MessageFormatter.php b/framework/yii/i18n/MessageFormatter.php
@@ -34,7 +34,7 @@ public function format($args)
 			return $this->getPattern();
 		}
 
-		if (self::needFix()) {
+		if (version_compare(PHP_VERSION, '5.5.0', '<')) {
 			$pattern = self::replaceNamedArguments($this->getPattern(), $args);
 			$this->setPattern($pattern);
 			$args = array_values($args);
@@ -57,7 +57,7 @@ public static function formatMessage($locale, $pattern, $args)
 			return $pattern;
 		}
 
-		if (self::needFix()) {
+		if (version_compare(PHP_VERSION, '5.5.0', '<')) {
 			$pattern = self::replaceNamedArguments($pattern, $args);
 			$args = array_values($args);
 		}
@@ -114,16 +114,5 @@ private static function replaceNamedArguments($pattern, $args)
 		}
 		return $pattern;
 	}
-
-	/**
-	 * Checks if fix should be applied
-	 *
-	 * @see http://php.net/manual/en/migration55.changed-functions.php
-	 * @return boolean if fix should be applied
-	 */
-	private static function needFix()
-	{
-		return version_compare(PHP_VERSION, '5.5.0', '<');
-	}
 }