Permalink
Browse files

Merge branch '2.1'

* 2.1:
  added missing use statment (closes #5825)
  Code cleanup
  [WebProfilerBundle] Fixed the use of nested macros
  Removed unused use statements.
  Nsdocblocks
  [ConfigDumpReference] avoid notice for variable nodes
  fixed fallback locale
  UniqueValidatorTest, Change message on assertions
  Documented removed _form_is_choice_group function

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
  • Loading branch information...
2 parents ba00dc6 + 1425dd6 commit dac97be810125b025f6dedff302bf32bd47179c8 @fabpot fabpot committed Oct 24, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 Normalizer/GetSetMethodNormalizer.php
@@ -179,7 +179,8 @@ private function supports($class)
/**
* Checks if a method's name is get.* and can be called without parameters.
*
- * @param ReflectionMethod $method the method to check
+ * @param \ReflectionMethod $method the method to check
+ *
* @return Boolean whether the method is a getter.
*/
private function isGetMethod(\ReflectionMethod $method)

0 comments on commit dac97be

Please sign in to comment.