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 5272b50 + a9355a7 commit ef5f0ab0c2115494911118f7014be5ebddbf172f @fabpot fabpot committed Oct 24, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 Tests/FilesystemTest.php
@@ -848,6 +848,8 @@ public function providePathsForIsAbsolutePath()
/**
* Returns file permissions as three digits (i.e. 755)
*
+ * @param string $filepath
+ *
* @return integer
*/
private function getFilePermissions($filePath)

0 comments on commit ef5f0ab

Please sign in to comment.