Merge branch '2.2' into 2.3

fabpot · fabpot · commit fb97d389c973 · 2013-10-10T15:12:30.000+02:00
* 2.2:
  bumped Symfony version to 2.2.10
  updated VERSION for 2.2.9
  update CONTRIBUTORS for 2.2.9
  updated CHANGELOG for 2.2.9
  [Security] limited the password length passed to encoders
  assets:install command should mirror .dotfiles (.htaccess)
  PoFileDumper - PO headers
  removed whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 } else {
                     $filesystem->mkdir($targetDir, 0777);
                     // We use a custom iterator to ignore VCS files
-                    $filesystem->mirror($originDir, $targetDir, Finder::create()->in($originDir));
+                    $filesystem->mirror($originDir, $targetDir, Finder::create()->ignoreDotFiles(false)->in($originDir));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`103`	`103`	`} else {`
`104`	`104`	`$filesystem->mkdir($targetDir, 0777);`
`105`	`105`	`// We use a custom iterator to ignore VCS files`
`106`		`- $filesystem->mirror($originDir, $targetDir, Finder::create()->in($originDir));`
	`106`	`+ $filesystem->mirror($originDir, $targetDir, Finder::create()->ignoreDotFiles(false)->in($originDir));`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`