Commit 3f1b1144 authored by Fabien Potencier's avatar Fabien Potencier

merged branch lyrixx/cleanup (PR #433)

Commits
-------

f618014e Remove use of the `use` in closure

Discussion
----------

Remove use of the `use` in closure

See https://github.com/fabpot/Pimple/blob/master/lib/Pimple.php#L81 :
Pimple give to the closure (as first argument) the container/application,
so we do not need to use `use($app)`.

Note :

* I did not test on php 5.4. But tests are OK on 5.3
* I think it is cleaner to use php default arguments than the use of `use`
* I fixed the CS :  `function()` -> `function ()` (added a space before `(`)
parents 344dd201 f618014e
...@@ -58,7 +58,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -58,7 +58,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
$app['dbs.options'] = $tmp; $app['dbs.options'] = $tmp;
}); });
$app['dbs'] = $app->share(function () use ($app) { $app['dbs'] = $app->share(function ($app) {
$app['dbs.options.initializer'](); $app['dbs.options.initializer']();
$dbs = new \Pimple(); $dbs = new \Pimple();
...@@ -78,7 +78,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -78,7 +78,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
return $dbs; return $dbs;
}); });
$app['dbs.config'] = $app->share(function () use ($app) { $app['dbs.config'] = $app->share(function ($app) {
$app['dbs.options.initializer'](); $app['dbs.options.initializer']();
$configs = new \Pimple(); $configs = new \Pimple();
...@@ -89,7 +89,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -89,7 +89,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
return $configs; return $configs;
}); });
$app['dbs.event_manager'] = $app->share(function () use ($app) { $app['dbs.event_manager'] = $app->share(function ($app) {
$app['dbs.options.initializer'](); $app['dbs.options.initializer']();
$managers = new \Pimple(); $managers = new \Pimple();
...@@ -101,19 +101,19 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -101,19 +101,19 @@ class DoctrineServiceProvider implements ServiceProviderInterface
}); });
// shortcuts for the "first" DB // shortcuts for the "first" DB
$app['db'] = $app->share(function() use ($app) { $app['db'] = $app->share(function ($app) {
$dbs = $app['dbs']; $dbs = $app['dbs'];
return $dbs[$app['dbs.default']]; return $dbs[$app['dbs.default']];
}); });
$app['db.config'] = $app->share(function() use ($app) { $app['db.config'] = $app->share(function ($app) {
$dbs = $app['dbs.config']; $dbs = $app['dbs.config'];
return $dbs[$app['dbs.default']]; return $dbs[$app['dbs.default']];
}); });
$app['db.event_manager'] = $app->share(function() use ($app) { $app['db.event_manager'] = $app->share(function ($app) {
$dbs = $app['dbs.event_manager']; $dbs = $app['dbs.event_manager'];
return $dbs[$app['dbs.default']]; return $dbs[$app['dbs.default']];
......
...@@ -46,7 +46,7 @@ class FormServiceProvider implements ServiceProviderInterface ...@@ -46,7 +46,7 @@ class FormServiceProvider implements ServiceProviderInterface
$app['form.secret'] = md5(__DIR__); $app['form.secret'] = md5(__DIR__);
$app['form.extensions'] = $app->share(function () use ($app) { $app['form.extensions'] = $app->share(function ($app) {
$extensions = array( $extensions = array(
new CoreExtension(), new CoreExtension(),
new CsrfExtension($app['form.csrf_provider']), new CsrfExtension($app['form.csrf_provider']),
...@@ -64,11 +64,11 @@ class FormServiceProvider implements ServiceProviderInterface ...@@ -64,11 +64,11 @@ class FormServiceProvider implements ServiceProviderInterface
return $extensions; return $extensions;
}); });
$app['form.factory'] = $app->share(function () use ($app) { $app['form.factory'] = $app->share(function ($app) {
return new FormFactory($app['form.extensions']); return new FormFactory($app['form.extensions']);
}); });
$app['form.csrf_provider'] = $app->share(function () use ($app) { $app['form.csrf_provider'] = $app->share(function ($app) {
if (isset($app['session'])) { if (isset($app['session'])) {
return new SessionCsrfProvider($app['session'], $app['form.secret']); return new SessionCsrfProvider($app['session'], $app['form.secret']);
} }
......
...@@ -26,15 +26,15 @@ class HttpCacheServiceProvider implements ServiceProviderInterface ...@@ -26,15 +26,15 @@ class HttpCacheServiceProvider implements ServiceProviderInterface
{ {
public function register(Application $app) public function register(Application $app)
{ {
$app['http_cache'] = $app->share(function () use ($app) { $app['http_cache'] = $app->share(function ($app) {
return new HttpCache($app, $app['http_cache.store'], $app['http_cache.esi'], $app['http_cache.options']); return new HttpCache($app, $app['http_cache.store'], $app['http_cache.esi'], $app['http_cache.options']);
}); });
$app['http_cache.esi'] = $app->share(function () use ($app) { $app['http_cache.esi'] = $app->share(function ($app) {
return new Esi(); return new Esi();
}); });
$app['http_cache.store'] = $app->share(function () use ($app) { $app['http_cache.store'] = $app->share(function ($app) {
return new Store($app['http_cache.cache_dir']); return new Store($app['http_cache.cache_dir']);
}); });
......
...@@ -35,7 +35,7 @@ class MonologServiceProvider implements ServiceProviderInterface ...@@ -35,7 +35,7 @@ class MonologServiceProvider implements ServiceProviderInterface
$app['monolog.logger.class'] = $bridge ? 'Symfony\Bridge\Monolog\Logger' : 'Monolog\Logger'; $app['monolog.logger.class'] = $bridge ? 'Symfony\Bridge\Monolog\Logger' : 'Monolog\Logger';
$app['monolog'] = $app->share(function () use ($app) { $app['monolog'] = $app->share(function ($app) {
$log = new $app['monolog.logger.class']($app['monolog.name']); $log = new $app['monolog.logger.class']($app['monolog.name']);
......
...@@ -69,11 +69,11 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -69,11 +69,11 @@ class SecurityServiceProvider implements ServiceProviderInterface
$app['security.role_hierarchy'] = array(); $app['security.role_hierarchy'] = array();
$app['security.access_rules'] = array(); $app['security.access_rules'] = array();
$app['security'] = $app->share(function () use ($app) { $app['security'] = $app->share(function ($app) {
return new SecurityContext($app['security.authentication_manager'], $app['security.access_manager']); return new SecurityContext($app['security.authentication_manager'], $app['security.access_manager']);
}); });
$app['security.authentication_manager'] = $app->share(function () use ($app) { $app['security.authentication_manager'] = $app->share(function ($app) {
$manager = new AuthenticationProviderManager($app['security.authentication_providers']); $manager = new AuthenticationProviderManager($app['security.authentication_providers']);
$manager->setEventDispatcher($app['dispatcher']); $manager->setEventDispatcher($app['dispatcher']);
...@@ -81,36 +81,36 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -81,36 +81,36 @@ class SecurityServiceProvider implements ServiceProviderInterface
}); });
// by default, all users use the digest encoder // by default, all users use the digest encoder
$app['security.encoder_factory'] = $app->share(function () use ($app) { $app['security.encoder_factory'] = $app->share(function ($app) {
return new EncoderFactory(array( return new EncoderFactory(array(
'Symfony\Component\Security\Core\User\UserInterface' => $app['security.encoder.digest'], 'Symfony\Component\Security\Core\User\UserInterface' => $app['security.encoder.digest'],
)); ));
}); });
$app['security.encoder.digest'] = $app->share(function () use ($app) { $app['security.encoder.digest'] = $app->share(function ($app) {
return new MessageDigestPasswordEncoder(); return new MessageDigestPasswordEncoder();
}); });
$app['security.user_checker'] = $app->share(function () use ($app) { $app['security.user_checker'] = $app->share(function ($app) {
return new UserChecker(); return new UserChecker();
}); });
$app['security.access_manager'] = $app->share(function () use ($app) { $app['security.access_manager'] = $app->share(function ($app) {
return new AccessDecisionManager($app['security.voters']); return new AccessDecisionManager($app['security.voters']);
}); });
$app['security.voters'] = $app->share(function () use ($app) { $app['security.voters'] = $app->share(function ($app) {
return array( return array(
new RoleHierarchyVoter(new RoleHierarchy($app['security.role_hierarchy'])), new RoleHierarchyVoter(new RoleHierarchy($app['security.role_hierarchy'])),
new AuthenticatedVoter($app['security.trust_resolver']), new AuthenticatedVoter($app['security.trust_resolver']),
); );
}); });
$app['security.firewall'] = $app->share(function () use ($app) { $app['security.firewall'] = $app->share(function ($app) {
return new Firewall($app['security.firewall_map'], $app['dispatcher']); return new Firewall($app['security.firewall_map'], $app['dispatcher']);
}); });
$app['security.channel_listener'] = $app->share(function () use ($app) { $app['security.channel_listener'] = $app->share(function ($app) {
return new ChannelListener( return new ChannelListener(
$app['security.access_map'], $app['security.access_map'],
new RetryAuthenticationEntryPoint($app['request.http_port'], $app['request.https_port']), new RetryAuthenticationEntryPoint($app['request.http_port'], $app['request.https_port']),
...@@ -149,7 +149,7 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -149,7 +149,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
}); });
} }
$app['security.firewall_map'] = $app->share(function () use ($app) { $app['security.firewall_map'] = $app->share(function ($app) {
$positions = array('logout', 'pre_auth', 'form', 'http', 'remember_me', 'anonymous'); $positions = array('logout', 'pre_auth', 'form', 'http', 'remember_me', 'anonymous');
$providers = array(); $providers = array();
$configs = array(); $configs = array();
...@@ -248,7 +248,7 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -248,7 +248,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
return $map; return $map;
}); });
$app['security.access_listener'] = $app->share(function () use ($app) { $app['security.access_listener'] = $app->share(function ($app) {
return new AccessListener( return new AccessListener(
$app['security'], $app['security'],
$app['security.access_manager'], $app['security.access_manager'],
...@@ -258,7 +258,7 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -258,7 +258,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
); );
}); });
$app['security.access_map'] = $app->share(function () use ($app) { $app['security.access_map'] = $app->share(function ($app) {
$map = new AccessMap(); $map = new AccessMap();
foreach ($app['security.access_rules'] as $rule) { foreach ($app['security.access_rules'] as $rule) {
...@@ -272,15 +272,15 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -272,15 +272,15 @@ class SecurityServiceProvider implements ServiceProviderInterface
return $map; return $map;
}); });
$app['security.trust_resolver'] = $app->share(function () use ($app) { $app['security.trust_resolver'] = $app->share(function ($app) {
return new AuthenticationTrustResolver('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken', 'Symfony\Component\Security\Core\Authentication\Token\RememberMeToken'); return new AuthenticationTrustResolver('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken', 'Symfony\Component\Security\Core\Authentication\Token\RememberMeToken');
}); });
$app['security.session_strategy'] = $app->share(function () use ($app) { $app['security.session_strategy'] = $app->share(function ($app) {
return new SessionAuthenticationStrategy('migrate'); return new SessionAuthenticationStrategy('migrate');
}); });
$app['security.http_utils'] = $app->share(function () use ($app) { $app['security.http_utils'] = $app->share(function ($app) {
return new HttpUtils(isset($app['url_generator']) ? $app['url_generator'] : null, $app['url_matcher']); return new HttpUtils(isset($app['url_generator']) ? $app['url_generator'] : null, $app['url_matcher']);
}); });
......
...@@ -39,7 +39,7 @@ class SessionServiceProvider implements ServiceProviderInterface ...@@ -39,7 +39,7 @@ class SessionServiceProvider implements ServiceProviderInterface
$app['session.test'] = false; $app['session.test'] = false;
$app['session'] = $app->share(function () use ($app) { $app['session'] = $app->share(function ($app) {
if (!isset($app['session.storage'])) { if (!isset($app['session.storage'])) {
if ($app['session.test']) { if ($app['session.test']) {
$app['session.storage'] = $app['session.storage.test']; $app['session.storage'] = $app['session.storage.test'];
...@@ -51,11 +51,11 @@ class SessionServiceProvider implements ServiceProviderInterface ...@@ -51,11 +51,11 @@ class SessionServiceProvider implements ServiceProviderInterface
return new Session($app['session.storage']); return new Session($app['session.storage']);
}); });
$app['session.storage.handler'] = $app->share(function () use ($app) { $app['session.storage.handler'] = $app->share(function ($app) {
return new FileSessionHandler($app['session.storage.save_path']); return new FileSessionHandler($app['session.storage.save_path']);
}); });
$app['session.storage.native'] = $app->share(function () use ($app) { $app['session.storage.native'] = $app->share(function ($app) {
return new NativeSessionStorage( return new NativeSessionStorage(
$app['session.storage.options'], $app['session.storage.options'],
$app['session.storage.handler'] $app['session.storage.handler']
......
...@@ -27,21 +27,21 @@ class SwiftmailerServiceProvider implements ServiceProviderInterface ...@@ -27,21 +27,21 @@ class SwiftmailerServiceProvider implements ServiceProviderInterface
$app['mailer.initialized'] = false; $app['mailer.initialized'] = false;
$app['mailer'] = $app->share(function () use ($app) { $app['mailer'] = $app->share(function ($app) {
$app['mailer.initialized'] = true; $app['mailer.initialized'] = true;
return new \Swift_Mailer($app['swiftmailer.spooltransport']); return new \Swift_Mailer($app['swiftmailer.spooltransport']);
}); });
$app['swiftmailer.spooltransport'] = $app->share(function () use ($app) { $app['swiftmailer.spooltransport'] = $app->share(function ($app) {
return new \Swift_SpoolTransport($app['swiftmailer.spool']); return new \Swift_SpoolTransport($app['swiftmailer.spool']);
}); });
$app['swiftmailer.spool'] = $app->share(function () use ($app) { $app['swiftmailer.spool'] = $app->share(function ($app) {
return new \Swift_MemorySpool(); return new \Swift_MemorySpool();
}); });
$app['swiftmailer.transport'] = $app->share(function () use ($app) { $app['swiftmailer.transport'] = $app->share(function ($app) {
$transport = new \Swift_Transport_EsmtpTransport( $transport = new \Swift_Transport_EsmtpTransport(
$app['swiftmailer.transport.buffer'], $app['swiftmailer.transport.buffer'],
array($app['swiftmailer.transport.authhandler']), array($app['swiftmailer.transport.authhandler']),
......
...@@ -28,7 +28,7 @@ class TranslationServiceProvider implements ServiceProviderInterface ...@@ -28,7 +28,7 @@ class TranslationServiceProvider implements ServiceProviderInterface
{ {
public function register(Application $app) public function register(Application $app)
{ {
$app['translator'] = $app->share(function () use ($app) { $app['translator'] = $app->share(function ($app) {
$translator = new Translator($app['locale'], $app['translator.message_selector']); $translator = new Translator($app['locale'], $app['translator.message_selector']);
if (isset($app['locale_fallback'])) { if (isset($app['locale_fallback'])) {
......
...@@ -33,7 +33,7 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -33,7 +33,7 @@ class TwigServiceProvider implements ServiceProviderInterface
$app['twig.path'] = array(); $app['twig.path'] = array();
$app['twig.templates'] = array(); $app['twig.templates'] = array();
$app['twig'] = $app->share(function () use ($app) { $app['twig'] = $app->share(function ($app) {
$app['twig.options'] = array_replace( $app['twig.options'] = array_replace(
array( array(
'charset' => $app['charset'], 'charset' => $app['charset'],
...@@ -81,15 +81,15 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -81,15 +81,15 @@ class TwigServiceProvider implements ServiceProviderInterface
return $twig; return $twig;
}); });
$app['twig.loader.filesystem'] = $app->share(function () use ($app) { $app['twig.loader.filesystem'] = $app->share(function ($app) {
return new \Twig_Loader_Filesystem($app['twig.path']); return new \Twig_Loader_Filesystem($app['twig.path']);
}); });
$app['twig.loader.array'] = $app->share(function () use ($app) { $app['twig.loader.array'] = $app->share(function ($app) {
return new \Twig_Loader_Array($app['twig.templates']); return new \Twig_Loader_Array($app['twig.templates']);
}); });
$app['twig.loader'] = $app->share(function () use ($app) { $app['twig.loader'] = $app->share(function ($app) {
return new \Twig_Loader_Chain(array( return new \Twig_Loader_Chain(array(
$app['twig.loader.filesystem'], $app['twig.loader.filesystem'],
$app['twig.loader.array'], $app['twig.loader.array'],
......
...@@ -25,7 +25,7 @@ class UrlGeneratorServiceProvider implements ServiceProviderInterface ...@@ -25,7 +25,7 @@ class UrlGeneratorServiceProvider implements ServiceProviderInterface
{ {
public function register(Application $app) public function register(Application $app)
{ {
$app['url_generator'] = $app->share(function () use ($app) { $app['url_generator'] = $app->share(function ($app) {
$app->flush(); $app->flush();
return new UrlGenerator($app['routes'], $app['request_context']); return new UrlGenerator($app['routes'], $app['request_context']);
......
...@@ -28,7 +28,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -28,7 +28,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
{ {
public function register(Application $app) public function register(Application $app)
{ {
$app['validator'] = $app->share(function () use ($app) { $app['validator'] = $app->share(function ($app) {
if (isset($app['translator'])) { if (isset($app['translator'])) {
$r = new \ReflectionClass('Symfony\Component\Validator\Validator'); $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
$app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.'.$app['locale'].'.xlf', $app['locale'], 'validators'); $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.'.$app['locale'].'.xlf', $app['locale'], 'validators');
...@@ -40,7 +40,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -40,7 +40,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
); );
}); });
$app['validator.mapping.class_metadata_factory'] = $app->share(function () use ($app) { $app['validator.mapping.class_metadata_factory'] = $app->share(function ($app) {
return new ClassMetadataFactory(new StaticMethodLoader()); return new ClassMetadataFactory(new StaticMethodLoader());
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment