Skip to content

Commit 35f06b9

Browse files
Merge branch '3.1'
* 3.1: [travis] Don't use parallel on HHVM [HttpKernel] Fix RequestDataCollector starting the session [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows [FrameworkBundle] Skip redis cache pools test on failed connection Fixed forwarded request data in templates [Security] Fix DebugAccessDecisionManager when object is not a scalar Skip some tests on HHVM due to a PHPunit bug Use the Trusty Travis infrastructure for HHVM builds LdapUserProvider: add missing argument type doc Fixed issue with missing argument in the abstract service definition for the ldap user provider Add 3.1 to PR template branch row, remove 2.3 Improve memory efficiency [Console] Fix BC break introduced by #18101 document method name changes in Voter class add missing hint for vote() argument type [#18838] add a test to avoid regressions bumped Symfony version to 3.1.1 updated VERSION for 3.1.0 updated CHANGELOG for 3.1.0 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 5ffc8af + f3c41dc commit 35f06b9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

DependencyInjection/Compiler/AddConsoleCommandPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container)
3838
throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "Symfony\\Component\\Console\\Command\\Command".', $id));
3939
}
4040
$container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);
41-
$serviceIds[] = $serviceId;
41+
$serviceIds[] = $definition->isPublic() ? $id : $serviceId;
4242
}
4343

4444
$container->setParameter('console.command.ids', $serviceIds);

Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public function testProcess($public)
4545
$this->assertTrue($container->hasDefinition($alias));
4646
}
4747

48+
$id = $public ? 'my-command' : 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';
4849
$this->assertTrue($container->hasParameter('console.command.ids'));
49-
$this->assertSame(array('console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand'), $container->getParameter('console.command.ids'));
50+
$this->assertSame(array($id), $container->getParameter('console.command.ids'));
5051
}
5152

5253
public function visibilityProvider()

Tests/Functional/CachePoolsTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
1515
use Symfony\Component\Cache\Adapter\RedisAdapter;
16+
use Symfony\Component\Cache\Exception\InvalidArgumentException;
1617

1718
class CachePoolsTest extends WebTestCase
1819
{
@@ -33,6 +34,11 @@ public function testRedisCachePools()
3334
throw $e;
3435
}
3536
$this->markTestSkipped($e->getMessage());
37+
} catch (InvalidArgumentException $e) {
38+
if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
39+
throw $e;
40+
}
41+
$this->markTestSkipped($e->getMessage());
3642
}
3743
}
3844

0 commit comments

Comments
 (0)