Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
4422f429
Commit
4422f429
authored
Jun 24, 2015
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed CS
parent
badec168
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
25 deletions
+23
-25
src/Silex/Application.php
src/Silex/Application.php
+2
-2
src/Silex/Application/SecurityTrait.php
src/Silex/Application/SecurityTrait.php
+0
-1
src/Silex/ConstraintValidatorFactory.php
src/Silex/ConstraintValidatorFactory.php
+2
-2
src/Silex/EventListener/MiddlewareListener.php
src/Silex/EventListener/MiddlewareListener.php
+1
-1
src/Silex/Provider/DoctrineServiceProvider.php
src/Silex/Provider/DoctrineServiceProvider.php
+4
-4
src/Silex/Provider/RememberMeServiceProvider.php
src/Silex/Provider/RememberMeServiceProvider.php
+7
-7
src/Silex/Provider/SwiftmailerServiceProvider.php
src/Silex/Provider/SwiftmailerServiceProvider.php
+5
-5
src/Silex/Provider/TwigServiceProvider.php
src/Silex/Provider/TwigServiceProvider.php
+2
-2
src/Silex/ViewListenerWrapper.php
src/Silex/ViewListenerWrapper.php
+0
-1
No files found.
src/Silex/Application.php
View file @
4422f429
...
@@ -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'
]();
...
...
src/Silex/Application/SecurityTrait.php
View file @
4422f429
...
@@ -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
()
...
...
src/Silex/ConstraintValidatorFactory.php
View file @
4422f429
...
@@ -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
();
}
}
/**
/**
...
...
src/Silex/EventListener/MiddlewareListener.php
View file @
4422f429
...
@@ -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
),
);
);
}
}
...
...
src/Silex/Provider/DoctrineServiceProvider.php
View file @
4422f429
...
@@ -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
,
);
);
...
...
src/Silex/Provider/RememberMeServiceProvider.php
View file @
4422f429
...
@@ -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
);
...
...
src/Silex/Provider/SwiftmailerServiceProvider.php
View file @
4422f429
...
@@ -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'
]);
...
...
src/Silex/Provider/TwigServiceProvider.php
View file @
4422f429
...
@@ -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'
]
);
);
...
...
src/Silex/ViewListenerWrapper.php
View file @
4422f429
...
@@ -84,5 +84,4 @@ class ViewListenerWrapper
...
@@ -84,5 +84,4 @@ class ViewListenerWrapper
return
true
;
return
true
;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment