Commit 4422f429 authored by Fabien Potencier's avatar Fabien Potencier

fixed CS

parent badec168
...@@ -46,7 +46,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte ...@@ -46,7 +46,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
const VERSION = '1.3.1-DEV'; const VERSION = '1.3.1-DEV';
const EARLY_EVENT = 512; const EARLY_EVENT = 512;
const LATE_EVENT = -512; const LATE_EVENT = -512;
protected $providers = array(); protected $providers = array();
protected $booted = false; protected $booted = false;
...@@ -90,7 +90,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte ...@@ -90,7 +90,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
$this['dispatcher_class'] = 'Symfony\\Component\\EventDispatcher\\EventDispatcher'; $this['dispatcher_class'] = 'Symfony\\Component\\EventDispatcher\\EventDispatcher';
$this['dispatcher'] = $this->share(function () use ($app) { $this['dispatcher'] = $this->share(function () use ($app) {
/** /**
* @var EventDispatcherInterface $dispatcher * @var EventDispatcherInterface
*/ */
$dispatcher = new $app['dispatcher_class'](); $dispatcher = new $app['dispatcher_class']();
......
...@@ -28,7 +28,6 @@ trait SecurityTrait ...@@ -28,7 +28,6 @@ trait SecurityTrait
* @return mixed * @return mixed
* *
* @see TokenInterface::getUser() * @see TokenInterface::getUser()
*
* @deprecated since 1.3, to be removed in 3.0 * @deprecated since 1.3, to be removed in 3.0
*/ */
public function user() public function user()
......
...@@ -46,9 +46,9 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface ...@@ -46,9 +46,9 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
*/ */
public function __construct(\Pimple $container, array $serviceNames = array()) public function __construct(\Pimple $container, array $serviceNames = array())
{ {
$this->container = $container; $this->container = $container;
$this->serviceNames = $serviceNames; $this->serviceNames = $serviceNames;
$this->validators = array(); $this->validators = array();
} }
/** /**
......
...@@ -89,7 +89,7 @@ class MiddlewareListener implements EventSubscriberInterface ...@@ -89,7 +89,7 @@ class MiddlewareListener implements EventSubscriberInterface
{ {
return array( return array(
// this must be executed after the late events defined with before() (and their priority is -512) // this must be executed after the late events defined with before() (and their priority is -512)
KernelEvents::REQUEST => array('onKernelRequest', -1024), KernelEvents::REQUEST => array('onKernelRequest', -1024),
KernelEvents::RESPONSE => array('onKernelResponse', 128), KernelEvents::RESPONSE => array('onKernelResponse', 128),
); );
} }
......
...@@ -28,10 +28,10 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -28,10 +28,10 @@ class DoctrineServiceProvider implements ServiceProviderInterface
public function register(Application $app) public function register(Application $app)
{ {
$app['db.default_options'] = array( $app['db.default_options'] = array(
'driver' => 'pdo_mysql', 'driver' => 'pdo_mysql',
'dbname' => null, 'dbname' => null,
'host' => 'localhost', 'host' => 'localhost',
'user' => 'root', 'user' => 'root',
'password' => null, 'password' => null,
); );
......
...@@ -59,13 +59,13 @@ class RememberMeServiceProvider implements ServiceProviderInterface ...@@ -59,13 +59,13 @@ class RememberMeServiceProvider implements ServiceProviderInterface
$app['security.remember_me.service._proto'] = $app->protect(function ($providerKey, $options) use ($app) { $app['security.remember_me.service._proto'] = $app->protect(function ($providerKey, $options) use ($app) {
return $app->share(function () use ($providerKey, $options, $app) { return $app->share(function () use ($providerKey, $options, $app) {
$options = array_replace(array( $options = array_replace(array(
'name' => 'REMEMBERME', 'name' => 'REMEMBERME',
'lifetime' => 31536000, 'lifetime' => 31536000,
'path' => '/', 'path' => '/',
'domain' => null, 'domain' => null,
'secure' => false, 'secure' => false,
'httponly' => true, 'httponly' => true,
'always_remember_me' => false, 'always_remember_me' => false,
'remember_me_parameter' => '_remember_me', 'remember_me_parameter' => '_remember_me',
), $options); ), $options);
......
...@@ -51,12 +51,12 @@ class SwiftmailerServiceProvider implements ServiceProviderInterface ...@@ -51,12 +51,12 @@ class SwiftmailerServiceProvider implements ServiceProviderInterface
); );
$options = $app['swiftmailer.options'] = array_replace(array( $options = $app['swiftmailer.options'] = array_replace(array(
'host' => 'localhost', 'host' => 'localhost',
'port' => 25, 'port' => 25,
'username' => '', 'username' => '',
'password' => '', 'password' => '',
'encryption' => null, 'encryption' => null,
'auth_mode' => null, 'auth_mode' => null,
), $app['swiftmailer.options']); ), $app['swiftmailer.options']);
$transport->setHost($options['host']); $transport->setHost($options['host']);
......
...@@ -38,8 +38,8 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -38,8 +38,8 @@ class TwigServiceProvider implements ServiceProviderInterface
$app['twig'] = $app->share(function ($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'],
'debug' => $app['debug'], 'debug' => $app['debug'],
'strict_variables' => $app['debug'], 'strict_variables' => $app['debug'],
), $app['twig.options'] ), $app['twig.options']
); );
......
...@@ -84,5 +84,4 @@ class ViewListenerWrapper ...@@ -84,5 +84,4 @@ class ViewListenerWrapper
return true; return true;
} }
} }
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