Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  fixed a typo
  fixed CS for lambdas
  [Yaml] fixed some license headers
  Fixes message value for objects
  Check for hour, minute & second validity
  fixed various typos
  [Filesystem] Fixed mirror for symlinks
  [Validator] Removed duplicated test for IBAN in data provider

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
  • Loading branch information...
commit 7c7c94826019ff9221ca72512300cbc2891d723d 2 parents e0bae31 + f2e1d0c
@fabpot fabpot authored
Showing with 5 additions and 5 deletions.
  1. +4 −4 Filesystem.php
  2. +1 −1  Tests/FilesystemTest.php
View
8 Filesystem.php
@@ -107,8 +107,8 @@ public function exists($files)
* Sets access and modification time of file.
*
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
- * @param integer $time The touch time as a unix timestamp
- * @param integer $atime The access time as a unix timestamp
+ * @param integer $time The touch time as a Unix timestamp
+ * @param integer $atime The access time as a Unix timestamp
*
* @throws IOException When touch fails
*/
@@ -309,7 +309,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
*/
public function makePathRelative($endPath, $startPath)
{
- // Normalize separators on windows
+ // Normalize separators on Windows
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
$endPath = strtr($endPath, '\\', '/');
$startPath = strtr($startPath, '\\', '/');
@@ -396,7 +396,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
}
} else {
if (is_link($file)) {
- $this->symlink($file, $target);
+ $this->symlink($file->getLinkTarget(), $target);
} elseif (is_dir($file)) {
$this->mkdir($target);
} elseif (is_file($file)) {
View
2  Tests/FilesystemTest.php
@@ -860,7 +860,7 @@ public function testDumpFile()
$this->assertFileExists($filename);
$this->assertSame('bar', file_get_contents($filename));
- // skip mode check on windows
+ // skip mode check on Windows
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
$this->assertFilePermissions(753, $filename);
}
Please sign in to comment.
Something went wrong with that request. Please try again.