Skip to content

Commit 5b6c1b3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4'
* 3.4: [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone [DI] Analyze setter-circular deps more precisely fixing that PropertyNormalizer supports parent properties [SecurityBundle] Don't trigger auto-picking notice if provider is set per listener [TwigBundle][FrameworkBundle] Remove the internals from debug autowiring [DI] Skip hot_path tag for deprecated services as their class might also be [Cache] Memcached options should ignore "lazy" [FrameworkBundle] Dont create empty bundles directory
2 parents a135690 + 9619815 commit 5b6c1b3

File tree

23 files changed

+208
-181
lines changed

23 files changed

+208
-181
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,17 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
6868
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
6969
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
7070
}
71-
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"~3.4-beta5@dev|^4.0-beta5@dev\"");
71+
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
72+
if (file_exists(($path = dirname(__DIR__)).'/composer.json')) {
73+
if (file_exists($path.'/vendor/symfony/phpunit-bridge/composer.json')) {
74+
$path .= '/vendor/symfony/phpunit-bridge';
75+
}
76+
} elseif (file_exists($path.'/symfony/phpunit-bridge/composer.json')) {
77+
$path .= '/symfony/phpunit-bridge';
78+
}
79+
if (file_exists($path)) {
80+
passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg($path));
81+
}
7282
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
7383
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
7484
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));

‎src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9898
}
9999
}
100100

101-
// Create the bundles directory otherwise symlink will fail.
102101
$bundlesDir = $targetArg.'/bundles/';
103-
$this->filesystem->mkdir($bundlesDir, 0777);
104102

105103
$io = new SymfonyStyle($input, $output);
106104
$io->newLine();
@@ -164,18 +162,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
164162
}
165163
}
166164
// remove the assets of the bundles that no longer exist
167-
$dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);
168-
$this->filesystem->remove($dirsToRemove);
165+
if (is_dir($bundlesDir)) {
166+
$dirsToRemove = Finder::create()->depth(0)->directories()->exclude($validAssetDirs)->in($bundlesDir);
167+
$this->filesystem->remove($dirsToRemove);
168+
}
169169

170-
$io->table(array('', 'Bundle', 'Method / Error'), $rows);
170+
if ($rows) {
171+
$io->table(array('', 'Bundle', 'Method / Error'), $rows);
172+
}
171173

172174
if (0 !== $exitCode) {
173175
$io->error('Some errors occurred while installing assets.');
174176
} else {
175177
if ($copyUsed) {
176178
$io->note('Some assets were installed via copy. If you make changes to these assets you have to run this command again.');
177179
}
178-
$io->success('All assets were successfully installed.');
180+
$io->success($rows ? 'All assets were successfully installed.' : 'No assets were provided by any bundle.');
179181
}
180182

181183
return $exitCode;

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

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

1414
use Doctrine\Common\Annotations\Reader;
1515
use Symfony\Bridge\Monolog\Processor\DebugProcessor;
16-
use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
17-
use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
18-
use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
19-
use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
20-
use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
21-
use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;
22-
use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
2316
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
2417
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2518
use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
@@ -120,10 +113,10 @@ public function load(array $configs, ContainerBuilder $container)
120113
$loader->load('console.xml');
121114

122115
if (!class_exists(BaseXliffLintCommand::class)) {
123-
$container->removeDefinition(XliffLintCommand::class);
116+
$container->removeDefinition('console.command.xliff_lint');
124117
}
125118
if (!class_exists(BaseYamlLintCommand::class)) {
126-
$container->removeDefinition(YamlLintCommand::class);
119+
$container->removeDefinition('console.command.yaml_lint');
127120
}
128121
}
129122

@@ -203,7 +196,7 @@ public function load(array $configs, ContainerBuilder $container)
203196
$container->removeDefinition('form.type_guesser.validator');
204197
}
205198
} else {
206-
$container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');
199+
$container->removeDefinition('console.command.form_debug');
207200
}
208201

209202
$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
@@ -431,7 +424,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
431424
private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
432425
{
433426
if (!$config['enabled']) {
434-
$container->removeDefinition(WorkflowDumpCommand::class);
427+
$container->removeDefinition('console.command.workflow_dump');
435428

436429
return;
437430
}
@@ -603,8 +596,8 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
603596
private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
604597
{
605598
if (!$this->isConfigEnabled($container, $config)) {
606-
$container->removeDefinition(RouterDebugCommand::class);
607-
$container->removeDefinition(RouterMatchCommand::class);
599+
$container->removeDefinition('console.command.router_debug');
600+
$container->removeDefinition('console.command.router_match');
608601

609602
return;
610603
}
@@ -857,8 +850,8 @@ private function createVersion(ContainerBuilder $container, $version, $format, $
857850
private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)
858851
{
859852
if (!$this->isConfigEnabled($container, $config)) {
860-
$container->removeDefinition(TranslationDebugCommand::class);
861-
$container->removeDefinition(TranslationUpdateCommand::class);
853+
$container->removeDefinition('console.command.translation_debug');
854+
$container->removeDefinition('console.command.translation_update');
862855

863856
return;
864857
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,95 +13,95 @@
1313
<tag name="monolog.logger" channel="console" />
1414
</service>
1515

16-
<service id="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
16+
<service id="console.command.about" class="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
1717
<tag name="console.command" command="about" />
1818
</service>
1919

20-
<service id="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
20+
<service id="console.command.assets_install" class="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
2121
<argument type="service" id="filesystem" />
2222
<tag name="console.command" command="assets:install" />
2323
</service>
2424

25-
<service id="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
25+
<service id="console.command.cache_clear" class="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
2626
<argument type="service" id="cache_clearer" />
2727
<argument type="service" id="filesystem" />
2828
<tag name="console.command" command="cache:clear" />
2929
</service>
3030

31-
<service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
31+
<service id="console.command.cache_pool_clear" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
3232
<argument type="service" id="cache.global_clearer" />
3333
<tag name="console.command" command="cache:pool:clear" />
3434
</service>
3535

36-
<service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
36+
<service id="console.command.cache_pool_prune" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
3737
<argument type="iterator" />
3838
<tag name="console.command" command="cache:pool:prune" />
3939
</service>
4040

41-
<service id="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
41+
<service id="console.command.cache_warmup" class="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
4242
<argument type="service" id="cache_warmer" />
4343
<tag name="console.command" command="cache:warmup" />
4444
</service>
4545

46-
<service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
46+
<service id="console.command.config_debug" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
4747
<tag name="console.command" command="debug:config" />
4848
</service>
4949

50-
<service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
50+
<service id="console.command.config_dump_reference" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
5151
<tag name="console.command" command="config:dump-reference" />
5252
</service>
5353

54-
<service id="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
54+
<service id="console.command.container_debug" class="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
5555
<tag name="console.command" command="debug:container" />
5656
</service>
5757

58-
<service id="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
58+
<service id="console.command.debug_autowiring" class="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
5959
<tag name="console.command" command="debug:autowiring" />
6060
</service>
6161

62-
<service id="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
62+
<service id="console.command.event_dispatcher_debug" class="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
6363
<argument type="service" id="event_dispatcher" />
6464
<tag name="console.command" command="debug:event-dispatcher" />
6565
</service>
6666

67-
<service id="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
67+
<service id="console.command.router_debug" class="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
6868
<argument type="service" id="router" />
6969
<tag name="console.command" command="debug:router" />
7070
</service>
7171

72-
<service id="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
72+
<service id="console.command.router_match" class="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
7373
<argument type="service" id="router" />
7474
<tag name="console.command" command="router:match" />
7575
</service>
7676

77-
<service id="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
77+
<service id="console.command.translation_debug" class="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
7878
<argument type="service" id="translator" />
7979
<argument type="service" id="translation.reader" />
8080
<argument type="service" id="translation.extractor" />
8181
<tag name="console.command" command="debug:translation" />
8282
</service>
8383

84-
<service id="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
84+
<service id="console.command.translation_update" class="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
8585
<argument type="service" id="translation.writer" />
8686
<argument type="service" id="translation.reader" />
8787
<argument type="service" id="translation.extractor" />
8888
<argument>%kernel.default_locale%</argument>
8989
<tag name="console.command" command="translation:update" />
9090
</service>
9191

92-
<service id="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
92+
<service id="console.command.workflow_dump" class="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
9393
<tag name="console.command" command="workflow:dump" />
9494
</service>
9595

96-
<service id="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
96+
<service id="console.command.xliff_lint" class="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
9797
<tag name="console.command" command="lint:xliff" />
9898
</service>
9999

100-
<service id="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
100+
<service id="console.command.yaml_lint" class="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
101101
<tag name="console.command" command="lint:yaml" />
102102
</service>
103103

104-
<service id="Symfony\Component\Form\Command\DebugCommand">
104+
<service id="console.command.form_debug" class="Symfony\Component\Form\Command\DebugCommand">
105105
<argument type="service" id="form.registry" />
106106
<argument type="collection" /> <!-- All form types namespaces are stored here by FormPass -->
107107
<argument type="collection" /> <!-- All services form types are stored here by FormPass -->

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
<argument type="tagged" tag="config_cache.resource_checker" />
5656
</service>
5757

58-
<service id="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
58+
<service id="dependency_injection.config.container_parameters_resource_checker" class="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
5959
<argument type="service" id="service_container" />
6060
<tag name="config_cache.resource_checker" priority="-980" />
6161
</service>
6262

63-
<service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
63+
<service id="config.resource.self_checking_resource_checker" class="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
6464
<tag name="config_cache.resource_checker" priority="-990" />
6565
</service>
6666

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
1313

1414
use Doctrine\Common\Annotations\Annotation;
15-
use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
1615
use Symfony\Bundle\FullStack;
1716
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1817
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
@@ -307,7 +306,7 @@ public function testWorkflowServicesCanBeEnabled()
307306
$container = $this->createContainerFromFile('workflows_enabled');
308307

309308
$this->assertTrue($container->has(Registry::class));
310-
$this->assertTrue($container->hasDefinition(WorkflowDumpCommand::class));
309+
$this->assertTrue($container->hasDefinition('console.command.workflow_dump'));
311310
}
312311

313312
public function testRouter()

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
1313

14-
use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
1514
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
1615
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
1716
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -109,7 +108,7 @@ public function load(array $configs, ContainerBuilder $container)
109108

110109
if (class_exists(Application::class)) {
111110
$loader->load('console.xml');
112-
$container->getDefinition(UserPasswordEncoderCommand::class)->replaceArgument(1, array_keys($config['encoders']));
111+
$container->getDefinition('security.command.user_password_encoder')->replaceArgument(1, array_keys($config['encoders']));
113112
}
114113

115114
$container->registerForAutoconfiguration(VoterInterface::class)
@@ -245,17 +244,16 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
245244
$config->replaceArgument(4, $firewall['stateless']);
246245

247246
// Provider id (must be configured explicitly per firewall/authenticator if more than one provider is set)
247+
$defaultProvider = null;
248248
if (isset($firewall['provider'])) {
249249
if (!isset($providerIds[$normalizedName = str_replace('-', '_', $firewall['provider'])])) {
250250
throw new InvalidConfigurationException(sprintf('Invalid firewall "%s": user provider "%s" not found.', $id, $firewall['provider']));
251251
}
252252
$defaultProvider = $providerIds[$normalizedName];
253-
} else {
254-
if (count($providerIds) > 1) {
255-
throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider on "%s" firewall is ambiguous as there is more than one registered provider.', $id));
256-
}
257-
253+
} elseif (1 === count($providerIds)) {
258254
$defaultProvider = reset($providerIds);
255+
} elseif ($providerIds) {
256+
throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider on "%s" firewall is ambiguous as there is more than one registered provider.', $id));
259257
}
260258

261259
$config->replaceArgument(5, $defaultProvider);
@@ -399,7 +397,7 @@ private function createContextListener($container, $contextKey)
399397
return $this->contextListeners[$contextKey] = $listenerId;
400398
}
401399

402-
private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $providerIds, $defaultEntryPoint)
400+
private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint)
403401
{
404402
$listeners = array();
405403
$hasListeners = false;
@@ -415,7 +413,7 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
415413
}
416414
$userProvider = $providerIds[$normalizedName];
417415
} else {
418-
$userProvider = $defaultProvider;
416+
$userProvider = $defaultProvider ?: $this->getFirstProvider($id, $key, $providerIds);
419417
}
420418

421419
list($provider, $listenerId, $defaultEntryPoint) = $factory->create($container, $id, $firewall[$key], $userProvider, $defaultEntryPoint);
@@ -598,7 +596,7 @@ private function createExceptionListener($container, $config, $id, $defaultEntry
598596

599597
private function createSwitchUserListener($container, $id, $config, $defaultProvider, $stateless)
600598
{
601-
$userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
599+
$userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : ($defaultProvider ?: $this->getFirstProvider($id, 'switch_user', $providerIds));
602600

603601
$switchUserListenerId = 'security.authentication.switchuser_listener.'.$id;
604602
$listener = $container->setDefinition($switchUserListenerId, new ChildDefinition('security.authentication.switchuser_listener'));
@@ -697,4 +695,14 @@ private function getExpressionLanguage()
697695

698696
return $this->expressionLanguage;
699697
}
698+
699+
/**
700+
* @deprecated since version 3.4, to be removed in 4.0
701+
*/
702+
private function getFirstProvider($firewallName, $listenerName, array $providerIds)
703+
{
704+
@trigger_error(sprintf('Listener "%s" on firewall "%s" has no "provider" set but multiple providers exist. Using the first configured provider (%s) is deprecated since 3.4 and will throw an exception in 4.0, set the "provider" key on the firewall instead.', $listenerName, $firewallName, $first = array_keys($providerIds)[0]), E_USER_DEPRECATED);
705+
706+
return $providerIds[$first];
707+
}
700708
}

‎src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand">
10+
<service id="security.command.user_password_encoder" class="Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand">
1111
<argument type="service" id="security.encoder_factory"/>
1212
<argument type="collection" /> <!-- encoders' user classes -->
1313
<tag name="console.command" command="security:encode-password" />

0 commit comments

Comments
 (0)