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 ed48c705edcdce3e42c39d2a0ccbe103ea8be99a 2 parents 72356bf + 60b8473
@fabpot fabpot authored
View
2  Finder.php
@@ -157,7 +157,7 @@ public function removeAdapters()
*/
public function getAdapters()
{
- return array_values(array_map(function(array $adapter) {
+ return array_values(array_map(function (array $adapter) {
return $adapter['adapter'];
}, $this->adapters));
}
View
4 Shell/Command.php
@@ -270,10 +270,10 @@ public function execute()
public function join()
{
return implode(' ', array_filter(
- array_map(function($bit) {
+ array_map(function ($bit) {
return $bit instanceof Command ? $bit->join() : ($bit ?: null);
}, $this->bits),
- function($bit) { return null !== $bit; }
+ function ($bit) { return null !== $bit; }
));
}
View
2  Shell/Shell.php
@@ -51,7 +51,7 @@ public function getType()
public function testCommand($command)
{
if (self::TYPE_WINDOWS === $this->type) {
- // todo: find a way to test if windows command exists
+ // todo: find a way to test if Windows command exists
return false;
}
View
10 Tests/FinderTest.php
@@ -583,7 +583,7 @@ public function testAdaptersOrdering()
$this->assertEquals(
array('c', 'e', 'a', 'd', 'b'),
- array_map(function(Adapter\AdapterInterface $adapter) {
+ array_map(function (Adapter\AdapterInterface $adapter) {
return $adapter->getName();
}, $finder->getAdapters())
);
@@ -609,7 +609,7 @@ public function testAdaptersChaining()
public function getAdaptersTestData()
{
return array_map(
- function ($adapter) { return array($adapter); },
+ function ($adapter) { return array($adapter); },
$this->getValidAdapters()
);
}
@@ -723,7 +723,7 @@ public function getTestPathData()
public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
{
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
- $this->markTestSkipped('chmod is not supported on windows');
+ $this->markTestSkipped('chmod is not supported on Windows');
}
$finder = $this->buildFinder($adapter);
@@ -749,7 +749,7 @@ public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
public function testIgnoredAccessDeniedException(Adapter\AdapterInterface $adapter)
{
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
- $this->markTestSkipped('chmod is not supported on windows');
+ $this->markTestSkipped('chmod is not supported on Windows');
}
$finder = $this->buildFinder($adapter);
@@ -791,7 +791,7 @@ private function getValidAdapters()
new Adapter\GnuFindAdapter(),
new Adapter\PhpAdapter()
),
- function (Adapter\AdapterInterface $adapter) {
+ function (Adapter\AdapterInterface $adapter) {
return $adapter->isSupported();
}
);
View
2  Tests/Iterator/MockFileListIterator.php
@@ -15,7 +15,7 @@ class MockFileListIterator extends \ArrayIterator
{
public function __construct(array $filesArray = array())
{
- $files = array_map(function($file){ return new MockSplFileInfo($file); }, $filesArray);
+ $files = array_map(function ($file) { return new MockSplFileInfo($file); }, $filesArray);
parent::__construct($files);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.