NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commitfcde9e6

committed

Merge branch '2.8' into 3.2

* 2.8: Revert "bug#21791 [SecurityBundle] only pass relevant user provider (xabbuh)" [DependencyInjection] inline conditional statements.

2 parents65b7d43 +15106bf commitfcde9e6Copy full SHA for fcde9e6

File tree

2 files changed

+20

-15

lines changed

src/Symfony
- Bundle/SecurityBundle/DependencyInjection
  - SecurityExtension.php
- Component/DependencyInjection/Dumper
  - PhpDumper.php

2 files changed

+20

-15

lines changed

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

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,16 @@ private function createFirewalls($config, ContainerBuilder $container)`
`223`	`223`	`$firewalls =$config['firewalls'];`
`224`	`224`	`$providerIds =$this->createUserProviders($config,$container);`
`225`	`225`
	`226`	`+// make the ContextListener aware of the configured user providers`
	`227`	`+$definition =$container->getDefinition('security.context_listener');`
	`228`	`+$arguments =$definition->getArguments();`
	`229`	`+$userProviders =array();`
	`230`	`+foreach ($providerIdsas$userProviderId) {`
	`231`	`+$userProviders[] =newReference($userProviderId);`
	`232`	`+ }`
	`233`	`+$arguments[1] =$userProviders;`
	`234`	`+$definition->setArguments($arguments);`
	`235`	`+`
`226`	`236`	`// load firewall map`
`227`	`237`	`$mapDef =$container->getDefinition('security.firewall.map');`
`228`	`238`	`$map =$authenticationProviders =array();`
`@@ -304,7 +314,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a`
`304`	`314`	`$contextKey =$firewall['context'];`
`305`	`315`	`}`
`306`	`316`
`307`		`-$listeners[] =newReference($this->createContextListener($container,$contextKey,$defaultProvider));`
	`317`	`+$listeners[] =newReference($this->createContextListener($container,$contextKey));`
`308`	`318`	`}`
`309`	`319`
`310`	`320`	`$config->replaceArgument(6,$contextKey);`
`@@ -413,15 +423,14 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a`
`413`	`423`	`returnarray($matcher,$listeners,$exceptionListener);`
`414`	`424`	`}`
`415`	`425`
`416`		`-privatefunctioncreateContextListener($container,$contextKey,$providerId)`
	`426`	`+privatefunctioncreateContextListener($container,$contextKey)`
`417`	`427`	`{`
`418`	`428`	`if (isset($this->contextListeners[$contextKey])) {`
`419`	`429`	`return$this->contextListeners[$contextKey];`
`420`	`430`	`}`
`421`	`431`
`422`	`432`	`$listenerId ='security.context_listener.'.count($this->contextListeners);`
`423`	`433`	`$listener =$container->setDefinition($listenerId,newDefinitionDecorator('security.context_listener'));`
`424`		`-$listener->replaceArgument(1,array(newReference($providerId)));`
`425`	`434`	`$listener->replaceArgument(2,$contextKey);`
`426`	`435`
`427`	`436`	`return$this->contextListeners[$contextKey] =$listenerId;`

`‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php‎`

Lines changed: 8 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -963,11 +963,7 @@ private function addPrivateServices()`
`963`	`963`	`privatefunctionaddAliases()`
`964`	`964`	`{`
`965`	`965`	`if (!$aliases =$this->container->getAliases()) {`
`966`		`-if ($this->container->isFrozen()) {`
`967`		`-return"\n\$this->aliases = array();\n";`
`968`		`- }else {`
`969`		`-return'';`
`970`		`- }`
	`966`	`+return$this->container->isFrozen() ?"\n\$this->aliases = array();\n" :'';`
`971`	`967`	`}`
`972`	`968`
`973`	`969`	`$code ="\$this->aliases = array(\n";`
`@@ -1426,9 +1422,9 @@ private function dumpValue($value, $interpolate = true)`
`1426`	`1422`	`}`
`1427`	`1423`	`}elseif (is_object($value) \|\|is_resource($value)) {`
`1428`	`1424`	`thrownewRuntimeException('Unable to dump a service container if a parameter is an object or a resource.');`
`1429`		`- }else {`
`1430`		`-return$this->export($value);`
`1431`	`1425`	`}`
	`1426`	`+`
	`1427`	`+return$this->export($value);`
`1432`	`1428`	`}`
`1433`	`1429`
`1434`	`1430`	`/**`
`@@ -1489,13 +1485,13 @@ private function getServiceCall($id, Reference $reference = null)`
`1489`	`1485`	`}`
`1490`	`1486`	`if (null !==$reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !==$reference->getInvalidBehavior()) {`
`1491`	`1487`	`returnsprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)',$id);`
`1492`		`- }else {`
`1493`		`-if ($this->container->hasAlias($id)) {`
`1494`		`-$id = (string)$this->container->getAlias($id);`
`1495`		`- }`
	`1488`	`+ }`
`1496`	`1489`
`1497`		`-returnsprintf('$this->get(\'%s\')',$id);`
	`1490`	`+if ($this->container->hasAlias($id)) {`
	`1491`	`+$id = (string)$this->container->getAlias($id);`
`1498`	`1492`	`}`
	`1493`	`+`
	`1494`	`+returnsprintf('$this->get(\'%s\')',$id);`
`1499`	`1495`	`}`
`1500`	`1496`
`1501`	`1497`	`/**`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfcde9e6

File tree

2 files changed

2 files changed

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

`‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php‎`

0 commit comments