Skip to content

Commit 51e66fe

Browse files
Merge branch '3.4'
* 3.4: [DI] Handle container.autowiring.strict_mode to opt-out from legacy autowiring [2.8] Fix some docblocks Escape trailing \ in QuestionHelper autocompletion [FrameworkBundle][Serializer] Remove outdated condition Add "doctrine/annotations" to top-level composer.json Fix phpdoc inconsistencies, simplify no-op sprintf. Remove inapplicable phpdoc comment nit: Fix phpdoc inconsistency and unreachable statement [DI] Register default env var provided types Fix phpdoc and unnecessary sprintf [FrameworkBundle][Workflow] Fix deprectation when checking workflow.registry service in dump command [Security] Fix BC layer for AbstractGuardAuthenticator subclasses Prefer line formatter on missing cli dumper [DI] Enhance service locator error message
2 parents 497fd28 + ce62b9a commit 51e66fe

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

Console/Descriptor/TextDescriptor.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,6 @@ protected function describeCallable($callable, array $options = array())
413413
$this->writeText($this->formatCallable($callable), $options);
414414
}
415415

416-
/**
417-
* @param array $array
418-
*/
419416
private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, $event, array $eventListeners, SymfonyStyle $io)
420417
{
421418
$tableHeaders = array('Order', 'Callable', 'Priority');

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
476476
private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
477477
{
478478
if (!$config['enabled']) {
479-
if (!class_exists(Workflow\Workflow::class)) {
480-
$container->removeDefinition(WorkflowDumpCommand::class);
481-
}
479+
$container->removeDefinition(WorkflowDumpCommand::class);
482480

483481
return;
484482
}

Tests/Functional/SerializerTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
15-
1614
/**
1715
* @author Kévin Dunglas <[email protected]>
1816
*/
1917
class SerializerTest extends WebTestCase
2018
{
2119
public function testDeserializeArrayOfObject()
2220
{
23-
if (!class_exists(DataUriNormalizer::class)) {
24-
$this->markTestSkipped('This test is only applicable when using the Symfony Serializer Component version 3.1 or superior.');
25-
}
26-
2721
static::bootKernel(array('test_case' => 'Serializer'));
2822
$container = static::$kernel->getContainer();
2923

0 commit comments

Comments
 (0)