Permalink
Browse files

Merge pull request #503 from mehlah/qa

Minor QA fixes
  • Loading branch information...
2 parents eeee1cb + 07d26a0 commit 2547b36df4136bea4023b8296006eabbe43875a4 @nateabele nateabele committed May 29, 2012
Showing with 6 additions and 3 deletions.
  1. +1 −1 g11n/Locale.php
  2. +1 −1 template/helper/Form.php
  3. +4 −1 test/Unit.php
View
@@ -196,7 +196,7 @@ public static function lookup($locales, $locale) {
if (($key = array_search(static::compose($tags), $locales)) !== false) {
return $locales[$key];
} elseif ($count == 1) {
- foreach($locales as $currentLocale) {
+ foreach ($locales as $currentLocale) {
if (strpos($currentLocale, current($tags) . '_') === 0) {
return $currentLocale;
}
@@ -344,9 +344,9 @@ public function end() {
/**
* Returns the entity that the `Form` helper is currently bound to.
*
+ * @see lithium\template\helper\Form::$_binding
* @param string $name If specified, match this field name against the list of bindings
* @param string $key If $name specified, where to store relevant $_binding key
- * @see lithium\template\helper\Form::$_binding
* @return object Returns an object, usually an instance of `lithium\data\Entity`.
*/
public function binding($name = null) {
View
@@ -247,6 +247,9 @@ public function fail($message = false) {
*
* in assertEqual, assertNotEqual, assertPattern and assertNotPattern this function is
* called to get rid of any EOL differences.
+ *
+ * @param mixed $expected
+ * @param mixed $result
*/
protected function _normalizeLineEndings($expected, $result) {
if (is_string($expected) && is_string($result)) {
@@ -255,7 +258,7 @@ protected function _normalizeLineEndings($expected, $result) {
}
return array($expected, $result);
}
-
+
/**
* Checks that the actual result is equal, but not neccessarily identical, to the expected
* result.

0 comments on commit 2547b36

Please sign in to comment.