Permalink
Browse files

Merge branch '2.3'

* 2.3: (33 commits)
  Revert "[Console] ensure exit code between 0-254"
  Added missing galician (gl) translations
  fix many-to-many Propel1 ModelChoiceList
  [Console] ensure exit code between 0-254
  Added Greek translation
  [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
  [FrameworkBundle] Fixed OutOfBoundException when session handler_id is null
  [DependencyInjection] Add support for aliases of aliases + regression test
  [Console] fix status code when Exception::getCode returns something like 0.1
  Fixed doc block on Filesystem::rename
  Fixed exit code for exceptions with error code 0
  [DependencyInjection] Rename ContainerBuilder::$aliases to avoid conflicting with the parent class
  [DependencyInjection] Remove get*Alias*Service methods from compiled containers
  [DependencyInjection] Fix aliased access of shared services, fixes #8096
  instantiate valid commands only
  bumped Symfony version to -DEV
  updated VERSION for 2.3.0
  updated CHANGELOG for 2.3.0
  [Config] Added tests for the FileResource and DirectoryResource.
  [Config] Fixed @covers annotation which ignored some of the methods from the code coverage.
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
  • Loading branch information...
2 parents 3567f5f + 89f93fa commit 7975f9df488adbc9cef2089bac2887f14085481f @fabpot fabpot committed Jun 11, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 Filesystem.php
View
@@ -234,13 +234,13 @@ public function chgrp($files, $group, $recursive = false)
}
/**
- * Renames a file.
+ * Renames a file or a directory.
*
- * @param string $origin The origin filename
- * @param string $target The new filename
+ * @param string $origin The origin filename or directory
+ * @param string $target The new filename or directory
* @param Boolean $overwrite Whether to overwrite the target if it already exists
*
- * @throws IOException When target file already exists
+ * @throws IOException When target file or directory already exists
* @throws IOException When origin cannot be renamed
*/
public function rename($origin, $target, $overwrite = false)

0 comments on commit 7975f9d

Please sign in to comment.